[Commits] r15686 - in /fsf/trunk/libc: ChangeLog nscd/nscd.c nss/makedb.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Nov  4 00:02:14 2011
New Revision: 15686

Log:
Import glibc-mainline for 2011-11-04

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nscd/nscd.c
    fsf/trunk/libc/nss/makedb.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Nov  4 00:02:14 2011
@@ -1,3 +1,11 @@
+2011-11-03  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* nscd/nscd.c (main): Don't start AVC thread until credentials are
+	installed.
+
+	* nss/makedb.c (set_file_creation_context): Do nothing if SELinux
+	is disabled.
+
 2011-11-02  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
 
 	* bits/ioctl-types.h (_IOT_sgttyb): Set number of chars to 4.

Modified: fsf/trunk/libc/nscd/nscd.c
==============================================================================
--- fsf/trunk/libc/nscd/nscd.c (original)
+++ fsf/trunk/libc/nscd/nscd.c Fri Nov  4 00:02:14 2011
@@ -263,10 +263,6 @@
     /* In foreground mode we are not paranoid.  */
     paranoia = 0;
 
-  /* Start the SELinux AVC.  */
-  if (selinux_enabled)
-    nscd_avc_init ();
-
   signal (SIGINT, termination_handler);
   signal (SIGQUIT, termination_handler);
   signal (SIGTERM, termination_handler);
@@ -293,6 +289,10 @@
 
   /* Init databases.  */
   nscd_init ();
+
+  /* Start the SELinux AVC.  */
+  if (selinux_enabled)
+    nscd_avc_init ();
 
   /* Handle incoming requests */
   start_threads ();

Modified: fsf/trunk/libc/nss/makedb.c
==============================================================================
--- fsf/trunk/libc/nss/makedb.c (original)
+++ fsf/trunk/libc/nss/makedb.c Fri Nov  4 00:02:14 2011
@@ -842,7 +842,7 @@
 
   /* Check if SELinux is enabled, and remember. */
   if (enabled == 0)
-    enabled = is_selinux_enabled ();
+    enabled = is_selinux_enabled () ? 1 : -1;
   if (enabled < 0)
     return;
 

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits