Don't fail in makedb if SELinux is disabled

diff --git a/ChangeLog b/ChangeLog
index d132b0b..28b9a43 100644 (file)
--- 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 8cee92f..1b19966 100644 (file)
--- 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;