Merge changes between r15584 and r15868 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@15869 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 4 insertions, 4 deletions

diff --git a/libc/nscd/nscd.c b/libc/nscd/nscd.c
index ccc0d761a..f0521fe0e 100644
--- a/libc/nscd/nscd.c
+++ b/libc/nscd/nscd.c
@@ -263,10 +263,6 @@ main (int argc, char **argv)
     /* 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);
@@ -294,6 +290,10 @@ main (int argc, char **argv)
   /* Init databases.  */
   nscd_init ();
 
+  /* Start the SELinux AVC.  */
+  if (selinux_enabled)
+    nscd_avc_init ();
+
   /* Handle incoming requests */
   start_threads ();