[Opendnssec-commits] [keihatsu.kirei.se/svn/dnssec] r5276 - branches/OpenDNSSEC-1.3 branches/OpenDNSSEC-1.3/tools trunk/OpenDNSSEC/tools

Rickard Bellgrim rickard at opendnssec.org
Fri Jul 1 10:44:37 CEST 2011


Author: rb
Date: 2011-07-01 10:44:37 +0200 (Fri, 01 Jul 2011)
New Revision: 5276

Modified:
   branches/OpenDNSSEC-1.3/NEWS
   branches/OpenDNSSEC-1.3/tools/ods-control.in
   trunk/OpenDNSSEC/tools/ods-control.in
Log:
If the Enforcer did not close down, you entered an infinite loop.


Modified: branches/OpenDNSSEC-1.3/NEWS
===================================================================
--- branches/OpenDNSSEC-1.3/NEWS	2011-07-01 08:21:16 UTC (rev 5275)
+++ branches/OpenDNSSEC-1.3/NEWS	2011-07-01 08:44:37 UTC (rev 5276)
@@ -6,6 +6,7 @@
 * Enforcer: Change message about KSK retirement to make it less confusing.
 
 Bugfixes:
+* If the Enforcer did not close down, you entered an infinite loop.
 * Signer Engine: Fix log message typos.
 * Signer Engine: Fix crash where ods-signer update
 * Signer Engine: Also replace DNSKEYs if <DNSKEY><TTL> has changed in policy.

Modified: branches/OpenDNSSEC-1.3/tools/ods-control.in
===================================================================
--- branches/OpenDNSSEC-1.3/tools/ods-control.in	2011-07-01 08:21:16 UTC (rev 5275)
+++ branches/OpenDNSSEC-1.3/tools/ods-control.in	2011-07-01 08:44:37 UTC (rev 5276)
@@ -108,8 +108,15 @@
 			kill -TERM `cat "$enforcer_pid_file"`
 			RETVAL=$?
 			if [ $RETVAL = 0 ]; then
+				i=0
 				while [ -r "$enforcer_pid_file" ]; do
 					sleep 1
+					i=`expr $i + 1`
+					if [ $i -ge 5 ]; then
+						RETVAL=1
+						echo "Could not stop enforcer"
+						break
+					fi
 				done
 			fi
 		else

Modified: trunk/OpenDNSSEC/tools/ods-control.in
===================================================================
--- trunk/OpenDNSSEC/tools/ods-control.in	2011-07-01 08:21:16 UTC (rev 5275)
+++ trunk/OpenDNSSEC/tools/ods-control.in	2011-07-01 08:44:37 UTC (rev 5276)
@@ -108,8 +108,15 @@
 			kill -TERM `cat "$enforcer_pid_file"`
 			RETVAL=$?
 			if [ $RETVAL = 0 ]; then
+				i=0
 				while [ -r "$enforcer_pid_file" ]; do
 					sleep 1
+					i=`expr $i + 1`
+					if [ $i -ge 5 ]; then
+						RETVAL=1
+						echo "Could not start enforcer"
+						break
+					fi
 				done
 			fi
 		else




More information about the Opendnssec-commits mailing list