ITS#3917 revert prev commit

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;

servers/slapd/slapcommon.c

@@ -400,6 +400,13 @@ 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 ) {