[commits] r827 - in /fsf/trunk/libc: ChangeLog nscd/nscd.init

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Dec  2 00:01:48 2006
New Revision: 827

Log:
Import glibc-mainline for 2006-12-02

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/nscd/nscd.init

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Dec  2 00:01:48 2006
@@ -1,3 +1,8 @@
+2006-12-01  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* nscd/nscd.init: Remove obsolete and commented-out -S option
+	handling.
+
 2006-12-01  Jan Kratochvil  <jan.kratochvil@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with

Modified: fsf/trunk/libc/nscd/nscd.init
==============================================================================
--- fsf/trunk/libc/nscd/nscd.init (original)
+++ fsf/trunk/libc/nscd/nscd.init Sat Dec  2 00:01:48 2006
@@ -49,15 +49,8 @@
 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