From: Andreas Schwab <schwab@redhat.com>
Date: Thu, 3 Nov 2011 13:26:38 +0000 (+0100)
Subject: Don't fail in makedb if SELinux is disabled
X-Git-Tag: glibc-2.15~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d;p=thirdparty%2Fglibc.git

Don't fail in makedb if SELinux is disabled
---

diff --git a/ChangeLog b/ChangeLog
index d132b0b9ff6..28b9a43ef81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Andreas Schwab  <schwab@redhat.com>
+
+	* nss/makedb.c (set_file_creation_context): Do nothing if SELinux
+	is disabled.
+
 2011-11-02  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* bits/ioctl-types.h (_IOT_sgttyb): Set number of chars to 4.
diff --git a/nss/makedb.c b/nss/makedb.c
index 8cee92f891b..1b1996647cc 100644
--- a/nss/makedb.c
+++ b/nss/makedb.c
@@ -842,7 +842,7 @@ set_file_creation_context (const char *outname, mode_t mode)
 
   /* Check if SELinux is enabled, and remember. */
   if (enabled == 0)
-    enabled = is_selinux_enabled ();
+    enabled = is_selinux_enabled () ? 1 : -1;
   if (enabled < 0)
     return;