From 6baa7db00812437bbc87e73faa1a11b6cf631958 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 23 Oct 2014 17:34:30 +0200
Subject: mac: also rename use_{smack,selinux,apparmor}() calls so that they
 share the new mac_{smack,selinux,apparmor}_xyz() convention

---
 src/journal/journald-native.c | 2 +-
 src/journal/journald-server.c | 2 +-
 src/journal/journald-stream.c | 2 +-
 src/journal/journald-syslog.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/journal')

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)
-- 
cgit v1.2.3-54-g00ecf