ITS#3917 init schema before parsing args

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index e0b870df4a7171cbb6e3b03af977b18e4e5f8c6f..b607bdb912af24a499ea03448791ea47f7e54c7e 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -271,6 +271,14 @@ 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" ) ) {
@@ -577,13 +585,6 @@ 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;

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 0ef4b4e1f18b6d9ffd662a2175c14d85c1ac1782..596cbc3182f60a34ed567f90a4511dd8ffb94c64 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -400,13 +400,6 @@ slap_tool_init(
        }
 #endif
                
-       rc = slap_schema_init();
-
-       if ( rc != 0 ) {
-               fprintf( stderr, "%s: slap_schema_init failed!\n", progname );
-               exit( EXIT_FAILURE );
-       }
-
        rc = slap_init( mode, progname );
 
        if ( rc != 0 ) {