upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#2236. Add missing connections_shutdown() call.

Browse source
This commit is contained in:
Kurt Zeilenga 2003-02-19 20:39:04 +00:00
parent fb73fea612
commit 05619c6ec7
3 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
servers/slapd/daemon.c
View file

@ -1916,11 +1916,17 @@ slapd_daemon_task(
#endif #endif
} }
if( slapd_gentle_shutdown != 2 ) if( slapd_gentle_shutdown != 2 ) {
close_listeners ( 0 ); close_listeners ( 0 );
}
free ( slap_listeners ); free ( slap_listeners );
slap_listeners = NULL; slap_listeners = NULL;
if( !slapd_gentle_shutdown ) {
connections_shutdown();
}
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, CRIT, LDAP_LOG( CONNECTION, CRIT,
"slapd_daemon_task: shutdown waiting for %d threads to terminate.\n", "slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",

8
tests/scripts/test007-replication
View file

@ -94,7 +94,7 @@ $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
RC=$? RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapadd failed ($RC)!" echo "ldapadd failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
@ -184,7 +184,7 @@ RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!" echo "ldapsearch failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
@ -196,12 +196,12 @@ RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!" echo "ldapsearch failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
SEARCHOUT=$MASTEROUT SEARCHOUT=$MASTEROUT

10
tests/scripts/test011-subtree-repl
View file

@ -107,7 +107,7 @@ $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
RC=$? RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapadd failed ($RC)!" echo "ldapadd failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
@ -204,7 +204,7 @@ RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!" echo "ldapsearch failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
@ -216,7 +216,7 @@ RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!" echo "ldapsearch failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
@ -228,12 +228,12 @@ RC=$?
if test $RC != 0 ; then if test $RC != 0 ; then
echo "ldapsearch failed ($RC)!" echo "ldapsearch failed ($RC)!"
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
exit $RC exit $RC
fi fi
kill -INT $PID $SLAVEPID kill -HUP $PID $SLAVEPID
kill -KILL $SLURPPID kill -KILL $SLURPPID
SEARCHOUT=$SUBMASTEROUT SEARCHOUT=$SUBMASTEROUT