From e4e7a5eb9baf44500cdedc5f9434b6023032f45a Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 15:13:09 +0000
Subject: [PATCH] auto-import changelog data from ypbind-1.7-8.src.rpm Mon Jun
 04 2001 Preston Brown <pbrown@redhat.com> - small fixes for initscript.
 Sometimes had trouble on slower systems     (#37463)

---
 ypbind.init | 24 ++++++++++++------------
 ypbind.spec |  6 +++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/ypbind.init b/ypbind.init
index 1978b49..519309c 100755
--- a/ypbind.init
+++ b/ypbind.init
@@ -2,7 +2,7 @@
 #
 # ypbind:       Starts the ypbind Daemon
 #
-# Version:      @(#) /etc/init.d/ypbind.init 1.2
+# Version:      @(#) /etc/init.d/ypbind.init 1.3
 #
 # chkconfig: - 27 73
 # description: This is a daemon which runs on NIS/YP clients and binds them \
@@ -31,7 +31,7 @@ start() {
 	        exit 1
 	   fi
 	fi
-	echo -n $"Binding to the NIS domain... "
+	echo -n $"Binding to the NIS domain: "
 	daemon ypbind $OTHER_YPBIND_OPTS
 	echo
         # the following fixes problems with the init scripts continuing
@@ -40,22 +40,22 @@ start() {
 	pid=`pidofproc ypbind`
 	if [ -n "$pid" ]; then
 	  echo -n $"Listening for an NIS domain server."
-	  sleep 1
-	  times=1
-	  until ypwhich > /dev/null 2>&1 || [ "$times" = "3" ]
-	  do
-	     RETVAL=$?
-             echo -n "."
-	     times=$[$times+1]
-	     sleep 1
+	  for (( times = 1; times < 5; times++ )); do
+	    ypwhich > /dev/null 2>&1
+	    RETVAL=$?
+	    if [ $RETVAL -eq 0 ]; then
+		break;
+	    fi
+	    sleep 1
+	    echo -n "."
 	  done
 	fi
 	if [ $RETVAL -eq 0 ]; then
-	    echo " `ypwhich 2>/dev/null`"
+	    initlog -n ypbind -s "bound to NIS server `ypwhich 2> /dev/null`"
 	    touch /var/lock/subsys/ypbind
 	else
 	    failure "attempting to contact yp server"
-	    kill "$pid"
+	    kill $pid
 	fi
 	echo
 	return $RETVAL
diff --git a/ypbind.spec b/ypbind.spec
index 2f88d12..f7eaaa7 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.7
-Release: 7
+Release: 8
 Copyright: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.gz
@@ -78,8 +78,8 @@ exit 0
 %doc README NEWS
 
 %changelog
-* Thu Apr 19 2001 Bill Nottingham <notting@redhat.com>
-- don't be in such a hurry (add a couple sleep calls)
+* Fri Jun  4 2001 Preston Brown <pbrown@redhat.com>
+- small fixes for initscript. Sometimes had trouble on slower systems (#37463)
 
 * Sat Mar  3 2001 Preston Brown <pbrown@redhat.com>
 - much more sane ypbind init script for when networking is down.