summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-10-23 17:34:30 +0200
committerLennart Poettering <lennart@poettering.net>2014-10-23 17:34:30 +0200
commit6baa7db00812437bbc87e73faa1a11b6cf631958 (patch)
treef3c4041b684cd55fe23d06eff9761ab2aca31332 /src/journal
parentcc56fafeebf814ef035e549115cf1850e6473fa5 (diff)
mac: also rename use_{smack,selinux,apparmor}() calls so that they share the new mac_{smack,selinux,apparmor}_xyz() convention
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journald-native.c2
-rw-r--r--src/journal/journald-server.c2
-rw-r--r--src/journal/journald-stream.c2
-rw-r--r--src/journal/journald-syslog.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index ac2d0ba148..a6352022dd 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -417,7 +417,7 @@ int server_open_native_socket(Server*s) {
}
#ifdef HAVE_SELINUX
- if (use_selinux()) {
+ if (mac_selinux_use()) {
one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 991f4f2a38..9709889e4a 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -680,7 +680,7 @@ static void dispatch_message_real(
}
#ifdef HAVE_SELINUX
- if (use_selinux()) {
+ if (mac_selinux_use()) {
if (label) {
x = alloca(strlen("_SELINUX_CONTEXT=") + label_len + 1);
diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 8a983d84d9..76580f8263 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -395,7 +395,7 @@ static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
}
#ifdef HAVE_SELINUX
- if (use_selinux()) {
+ if (mac_selinux_use()) {
if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT)
log_error("Failed to determine peer security context: %m");
}
diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 656dc72bb9..79c07fffa1 100644
--- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c
@@ -457,7 +457,7 @@ int server_open_syslog_socket(Server *s) {
}
#ifdef HAVE_SELINUX
- if (use_selinux()) {
+ if (mac_selinux_use()) {
one = 1;
r = setsockopt(s->syslog_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)