ITS#2236. Add missing connections_shutdown() call.

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index d4d42e3492716e529829833dfcc7344b38098a13..ea1d1b7e7ce236d72ccda23a1b85b5ca46eeac30 100644 (file)
--- 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 8f4262ca26cdb26b9624cf0f29286a83e5db97b9..f7db56f67b49c2c668cc48e877b4ba9e1a5e279d 100755 (executable)
--- 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 c8546e6997f69ee7ec88dac726f453611fd39168..c4a6607238fd673e11cf9e2f8e3b6b1906a96d77 100755 (executable)
--- 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