about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--nscd/nscd.init9
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index e164a1614b..d361fc552d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01  Ulrich Drepper  <drepper@redhat.com>
+
+	* nscd/nscd.init: Remove obsolete and commented-out -S option
+	handling.
+
 2006-12-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with
diff --git a/nscd/nscd.init b/nscd/nscd.init
index a0074b99e5..a882da7d8b 100644
--- a/nscd/nscd.init
+++ b/nscd/nscd.init
@@ -49,15 +49,8 @@ prog=nscd
 start () {
     [ -d /var/run/nscd ] || mkdir /var/run/nscd
     [ -d /var/db/nscd ] || mkdir /var/db/nscd
-    secure=""
-#   for table in passwd group hosts
-#   do
-#   	if egrep -q '^'$table':.*nisplus' /etc/nsswitch.conf; then
-#   	    /usr/lib/nscd_nischeck $table || secure="$secure -S $table,yes"
-#   	fi
-#   done
     echo -n $"Starting $prog: "
-    daemon /usr/sbin/nscd $secure
+    daemon /usr/sbin/nscd
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd