- fixed shutdown with initscript when rndc doesn't work (#417431)

- fixed IDN patch (#412241)

1 files changed, 4 insertions, 7 deletions

diff --git a/named.init b/named.init
index e84f1af..3304aff 100755
--- a/named.init
+++ b/named.init
@@ -142,20 +142,17 @@ stop() {
   # is it still here?
   if /sbin/pidof -o %PPID "$named" >/dev/null; then
     timeout=0
-    while : ; do
-      if /sbin/pidof -o %PPID "$named" >/dev/null; then
+    killproc "$named" -TERM >/dev/null 2>&1
+    RETVAL=0
+    while [ `/sbin/pidof -o %PPID "$named" >/dev/null` ]; do
         if [ $timeout -ge $NAMED_SHUTDOWN_TIMEOUT ]; then
-          killproc "$named" -TERM >/dev/null 2>&1
-          RETVAL=$?
+	  RETVAL=1
           echo $"no response, killing with -TERM "
           break
         else
           sleep 2 && echo -n "."
           timeout=$((timeout+2))
         fi;
-      else
-        break
-      fi;
     done
   fi;