From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 7 Dec 2009 20:22:31 +0000 (+0000)
Subject: ITS#6420
X-Git-Tag: OPENLDAP_REL_ENG_2_4_21~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=829a3024e438f0fbf4764abd64c6bd24619b9275;p=openldap

ITS#6420
---

diff --git a/CHANGES b/CHANGES
index 015c383d3f..140ce48bb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,7 @@ OpenLDAP 2.4.21 Engineering
 	Fixed slapo-unique criteria checking (ITS#6270)
 	Build Environment
 		Deleted broken LBER_INVALID macro (ITS#6402)
+		Fixed test058 kill usage (ITS#6420)
 
 OpenLDAP 2.4.20 Release (2009/11/27)
 	Fixed client tools with LDAP options (ITS#6283)
diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 51c1295c3d..3730bcd4c9 100755
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -1643,7 +1643,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$NMUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to site1 search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1656,7 +1656,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$MNUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to central search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1731,7 +1731,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$MNUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to central search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1744,7 +1744,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$MNUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to central search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1801,7 +1801,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$NMUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to site2 search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1877,7 +1877,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$MNUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to site2 search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1890,7 +1890,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$MNUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to site2 search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1
@@ -1947,7 +1947,7 @@ for i in 1 2 3 4 5; do
 		"(description=Modify$MNUM)" 2>&1 | awk '/^dn:/ {print "NOK"}'`
 	if test "x$RESULT" = "xNOK" ; then
 		echo "Change was replicated to central search!"
-		test $KILLSERVERS != no && KILL -HUP $KILLPIDS
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
 		exit 1
 	fi
 	sleep 1