From 4e0810ffffeaf138efdaf82cae32bc64138109a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Honza=20Hor=C3=A1k?= <hhorak@redhat.com>
Date: Tue, 15 Nov 2011 10:41:53 +0100
Subject: [PATCH] Fixed ypbind-post-waitbind to handle long rpcinfo requests
 Resolves: #624688

---
 ypbind-post-waitbind | 10 +++-------
 ypbind.spec          |  6 +++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ypbind-post-waitbind b/ypbind-post-waitbind
index 57d7624..1c3787c 100755
--- a/ypbind-post-waitbind
+++ b/ypbind-post-waitbind
@@ -14,18 +14,14 @@
 
 logger -t ypbind $"Binding NIS service"
 
-timeout=10
+timeout=$NISTIMEOUT
 firsttime=1
 SECONDS=0
 retval=0
-while [ $SECONDS -lt $timeout ]; do
+while [ $SECONDS -lt $timeout ] || [ $firsttime -eq 1 ] ; do
 if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
 then
-    if [ $firsttime -eq 1 ]; then
-	# reset timeout
-	timeout=$NISTIMEOUT
-	firsttime=0
-    fi
+    firsttime=0
     /usr/bin/ypwhich > /dev/null 2>&1
     retval=$?
     if [ $retval -eq 0 ]; then
diff --git a/ypbind.spec b/ypbind.spec
index 165a084..4838326 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.33
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -117,6 +117,10 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Tue Nov 15 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-8
+- Fixed ypbind-post-waitbind to handle long rpcinfo requests
+  Resolves: #624688
+
 * Mon Sep 26 2011 Honza Horak <hhorak@redhat.com> - 3:1.33-7
 - Don't turn off allow_ypbind SELinux boolean
   Resolves: #741141