This commit was manufactured by cvs2git to create branch 'GLIBC_2_2_5'.

Cherrypick from master 2002-02-03 13:38:54 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- back to int':
    glibc-use-int-not-arpa.patch -> 1.1
    nscd.init -> 1.8

diff --git a/glibc-use-int-not-arpa.patch b/glibc-use-int-not-arpa.patch
new file mode 100644 (file)
index 0000000..6bcd13a
--- /dev/null
+++ b/glibc-use-int-not-arpa.patch
@@ -0,0 +1,24 @@
+diff -urN glibc-2.2.5.org/resolv/gethnamaddr.c glibc-2.2.5/resolv/gethnamaddr.c
+--- glibc-2.2.5.org/resolv/gethnamaddr.c       Tue Jan 29 20:06:05 2002
++++ glibc-2.2.5/resolv/gethnamaddr.c   Sun Feb  3 14:37:40 2002
+@@ -690,7 +690,7 @@
+                                      uaddr[n] & 0xf,
+                                      (uaddr[n] >> 4) & 0xf));
+               }
+-              strcpy(qp, "ip6.arpa");
++              strcpy(qp, "ip6.int");
+               break;
+       default:
+               abort();
+diff -urN glibc-2.2.5.org/resolv/nss_dns/dns-host.c glibc-2.2.5/resolv/nss_dns/dns-host.c
+--- glibc-2.2.5.org/resolv/nss_dns/dns-host.c  Tue Jan 29 20:06:05 2002
++++ glibc-2.2.5/resolv/nss_dns/dns-host.c      Sun Feb  3 14:37:56 2002
+@@ -282,7 +282,7 @@
+       qp = qbuf;
+       for (n = IN6ADDRSZ - 1; n >= 0; n--)
+       qp += sprintf (qp, "%x.%x.", uaddr[n] & 0xf, (uaddr[n] >> 4) & 0xf);
+-      strcpy (qp, "ip6.arpa");
++      strcpy (qp, "ip6.int");
+       break;
+     default:
+       /* Cannot happen.  */

diff --git a/nscd.init b/nscd.init
new file mode 100644 (file)
index 0000000..fccb928
--- /dev/null
+++ b/nscd.init
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# nscd:                Starts the Name Switch Cache Daemon
+#
+# chkconfig:   345 30 80
+# description: This is a daemon which handles passwd and group lookups \
+#              for running programs and cache the results for the next \
+#              query. You should start this daemon only if you use \
+#              slow Services like NIS or NIS+
+# processname: nscd
+# config:      /etc/nscd.conf
+#
+
+# Sanity checks.
+[ -f /etc/nscd.conf ] || exit 0
+[ -x /usr/sbin/nscd ] || exit 0
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Get sysconfig
+[ -f /etc/sysconfig/nscd ] && . /etc/sysconfig/nscd
+  
+# See how we were called.
+case "$1" in
+    start)
+       if [ ! -f /var/lock/subsys/nscd ]; then
+               msg_starting "Name Switch Cache Daemon"
+               daemon nscd
+               RETVAL=$?
+               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
+       else
+               msg_already_running "Name Switch Cache Daemon"
+               exit 1
+       fi
+        touch /var/lock/subsys/nscd
+        ;;
+    stop)
+       if [ -f /var/lock/subsys/nscd ]; then
+               msg_stopping "Name Switch Cache Daemon"
+               busy
+               /usr/sbin/nscd -K
+               rm -f /var/lock/subsys/nscd >/dev/null 2>&1
+               deltext
+               ok
+       else
+               msg_not_running "Name Switch Cache Daemon"
+               exit 1
+       fi      
+       ;;
+  status)
+        status nscd
+        ;;
+  restart|reload)
+        $0 stop
+        $0 start
+        ;;
+    *)
+       msg_usage "$0 {start|stop|status|restart|reload}"
+       exit 1
+       ;;
+esac
+
+exit $RETVAL