ITS#3917 revert prev commit

[openldap] / servers / slapd / main.c

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 3fc69e45e7c5eba98d00bec579d9d889aa212e62..4f6360f62693d5827a320adc98697094c6ac39ac 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -272,14 +272,6 @@ int main( int argc, char **argv )
 
        slap_sl_mem_init();
 
-       if (( rc = slap_schema_init( )) != 0 ) {
-               Debug( LDAP_DEBUG_ANY,
-                   "schema initialization error\n",
-                   0, 0, 0 );
-
-               MAIN_RETURN(rc);
-       }
-
        serverName = lutil_progname( "slapd", argc, argv );
 
        if ( strcmp( serverName, "slapd" ) ) {
@@ -600,6 +592,13 @@ unhandled_option:;
        }
 #endif
 
+       if ( slap_schema_init( ) != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                   "schema initialization error\n",
+                   0, 0, 0 );
+
+               goto destroy;
+       }
 
        if ( slap_init( serverMode, serverName ) != 0 ) {
                rc = 1;