From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 23 May 2012 10:49:41 +0000 (+0200)
Subject: journal: don't complain if SELinux userspace is available but the kernel lacks it
X-Git-Tag: v183~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1afd5be42f8f4105dd47c71ce968c9d5bf81e0a8;p=elogind.git

journal: don't complain if SELinux userspace is available but the kernel lacks it
---

diff --git a/TODO b/TODO
index b3b8f40f0..a0be14d0d 100644
--- a/TODO
+++ b/TODO
@@ -23,6 +23,8 @@ Bugfixes:
 
 Features:
 
+* For Type=idle don't get confused by ExecStartPre= getting the effect of the idle hup but delaying jobs going away
+
 * drop accountsservice's StandardOutput=syslog and Type=dbus fields
 
 * systemctl status for a unloaded unit is broken (Michal?)
@@ -111,8 +113,6 @@ Features:
 
 * allow configuration of console width/height in vconsole.conf
 
-* fstab should take priority over units in /usr
-
 * cleanup syslog 'priority' vs. 'level' wording
 
 * journal: if mmap() fails for mapping window try to unmap a a few older maps
diff --git a/src/journal/journald.c b/src/journal/journald.c
index c429896ac..7776c2a25 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -1692,8 +1692,8 @@ static int stdout_stream_new(Server *s) {
         }
 
 #ifdef HAVE_SELINUX
-        if (getpeercon(fd, &stream->security_context) < 0)
-                log_error("Failed to determine peer security context.");
+        if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT)
+                log_error("Failed to determine peer security context: %m");
 #endif
 
         if (shutdown(fd, SHUT_WR) < 0) {