Sync with HEAD

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index b81566e0b65a7976bd50af8f741679af728a1cd6..6a931617e0e0cf247092aa60203b9b103a565a74 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -456,7 +456,7 @@ slap_tool_init(
 
 void slap_tool_destroy( void )
 {
-       if ( !dryrun ) {
+       if ( !dryrun && be != NULL ) {
                slap_shutdown( be );
        }
        slap_destroy();