aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--nscd/nscd.c8
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 28b9a43ef8..a65182acf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-11-03 Andreas Schwab <schwab@redhat.com>
+ * 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.
diff --git a/nscd/nscd.c b/nscd/nscd.c
index e9bb75d3e9..be693c9d5c 100644
--- a/nscd/nscd.c
+++ b/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 ();