From 05619c6ec7dd6d3c9874a3673786861e86f40b5c Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 19 Feb 2003 20:39:04 +0000
Subject: [PATCH] ITS#2236.  Add missing connections_shutdown() call.

---
 servers/slapd/daemon.c             |  8 +++++++-
 tests/scripts/test007-replication  |  8 ++++----
 tests/scripts/test011-subtree-repl | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index d4d42e3492..ea1d1b7e7c 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -1916,11 +1916,17 @@ slapd_daemon_task(
 #endif
 	}
 
-	if( slapd_gentle_shutdown != 2 )
+	if( slapd_gentle_shutdown != 2 ) {
 		close_listeners ( 0 );
+	}
+
 	free ( slap_listeners );
 	slap_listeners = NULL;
 
+	if( !slapd_gentle_shutdown ) {
+		connections_shutdown();
+	}
+
 #ifdef NEW_LOGGING
 	LDAP_LOG( CONNECTION, CRIT, 
 		"slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 8f4262ca26..f7db56f67b 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -94,7 +94,7 @@ $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapadd failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
@@ -184,7 +184,7 @@ RC=$?
 
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
@@ -196,12 +196,12 @@ RC=$?
 
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
 
-kill -INT $PID $SLAVEPID
+kill -HUP $PID $SLAVEPID
 kill -KILL $SLURPPID
 
 SEARCHOUT=$MASTEROUT
diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl
index c8546e6997..c4a6607238 100755
--- a/tests/scripts/test011-subtree-repl
+++ b/tests/scripts/test011-subtree-repl
@@ -107,7 +107,7 @@ $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapadd failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
@@ -204,7 +204,7 @@ RC=$?
 
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
@@ -216,7 +216,7 @@ RC=$?
 
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
@@ -228,12 +228,12 @@ RC=$?
 
 if test $RC != 0 ; then
 	echo "ldapsearch failed ($RC)!"
-	kill -INT $PID $SLAVEPID
+	kill -HUP $PID $SLAVEPID
 	kill -KILL $SLURPPID
 	exit $RC
 fi
 
-kill -INT $PID $SLAVEPID
+kill -HUP $PID $SLAVEPID
 kill -KILL $SLURPPID
 
 SEARCHOUT=$SUBMASTEROUT
-- 
2.39.5