Minor fixes to complete backout of initialization/startup changes.

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 684a9d235d1f76cdce045b30fc11c063a19edd46..8ed04295fcf5b631bb87bc3b1b6b57bac50d0ab7 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -399,7 +399,7 @@ slapd_daemon(
        Debug( LDAP_DEBUG_TRACE,
            "slapd shutdown: shutdown backends.\n",
            0, 0, 0 );
-       be_shutdown();
+       /* be_shutdown(); */
        Debug( LDAP_DEBUG_ANY, "slapd: stopped\n", 0, 0, 0 );
 
        return NULL;

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index de44b19691d29432f65285b0b8c70869faad0328..3a2a136c276d1e20fae96bcd4c41f2605be64ed9 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -188,7 +188,7 @@ main( int argc, char **argv )
 #endif
 
        init();
-       read_config_env( configfile, &be, fp, 1 );
+       read_config( configfile, &be, fp );
 
        if ( ! inetd ) {
                int             status;