2c67eb0
commit 3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d
2c67eb0
Author: Andreas Schwab <schwab@redhat.com>
2c67eb0
Date:   Thu Nov 3 14:26:38 2011 +0100
2c67eb0
2c67eb0
    Don't fail in makedb if SELinux is disabled
2c67eb0
2c67eb0
*** a/ChangeLog	Wed Nov 30 12:38:59 2011
2c67eb0
--- b/ChangeLog	Wed Nov 30 12:39:17 2011
2c67eb0
***************
2c67eb0
*** 9,14 ****
2c67eb0
--- 9,19 ----
2c67eb0
  	(reused_arena): Don't check arena limit.
2c67eb0
  	(arena_get2): Atomically check arena limit.
2c67eb0
  
2c67eb0
+ 2011-11-03  Andreas Schwab  <schwab@redhat.com>
2c67eb0
+ 
2c67eb0
+ 	* nss/makedb.c (set_file_creation_context): Do nothing if SELinux
2c67eb0
+ 	is disabled.
2c67eb0
+ 
2c67eb0
  2011-10-19  Andreas Schwab  <schwab@redhat.com>
2c67eb0
  
2c67eb0
  	* sysdeps/x86_64/fpu/math_private.h (libc_feupdateenv): Use
2c67eb0
diff --git a/nss/makedb.c b/nss/makedb.c
2c67eb0
index 8cee92f..1b19966 100644
2c67eb0
--- a/nss/makedb.c
2c67eb0
+++ b/nss/makedb.c
2c67eb0
@@ -842,7 +842,7 @@ set_file_creation_context (const char *outname, mode_t mode)
2c67eb0
 
2c67eb0
   /* Check if SELinux is enabled, and remember. */
2c67eb0
   if (enabled == 0)
2c67eb0
-    enabled = is_selinux_enabled ();
2c67eb0
+    enabled = is_selinux_enabled () ? 1 : -1;
2c67eb0
   if (enabled < 0)
2c67eb0
     return;
2c67eb0