ITS#7904 more tweaks

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 8b0fad164dcef92878b4d08f3a17956bd43a256d..14791b0952c74b46e35b751a9fbe04ddf55805b2 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2012 The OpenLDAP Foundation.
+ * Copyright 1998-2014 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -211,12 +211,15 @@ slap_init( int mode, const char *name )
 
 int slap_startup( Backend *be )
 {
+       int rc;
        Debug( LDAP_DEBUG_TRACE,
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
 
-
-       return backend_startup( be );
+       rc = backend_startup( be );
+       if ( !rc && ( slapMode & SLAP_SERVER_MODE ))
+               slapMode |= SLAP_SERVER_RUNNING;
+       return rc;
 }
 
 int slap_shutdown( Backend *be )