Relocate schema_init() call to main()

[openldap] / servers / slapd / tools / slapcommon.c

diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c
index dd4095e74a4d52748fdb6dd70878172bbba2080f..45ba63a2d88e346a4886e5f611199e89fd3d9b6a 100644 (file)
--- a/servers/slapd/tools/slapcommon.c
+++ b/servers/slapd/tools/slapcommon.c
@@ -188,6 +188,13 @@ slap_tool_init(
                exit( EXIT_FAILURE );
        }
 
+       rc = schema_init();
+
+       if (rc != 0 ) {
+               fprintf( stderr, "%s: slap_schema_init failed!\n", progname );
+               exit( EXIT_FAILURE );
+       }
+
        read_config( conffile );
 
        if ( !nbackends ) {
@@ -195,6 +202,13 @@ slap_tool_init(
                exit( EXIT_FAILURE );
        }
 
+       rc = schema_prep();
+
+       if (rc != 0 ) {
+               fprintf( stderr, "%s: slap_schema_prep failed!\n", progname );
+               exit( EXIT_FAILURE );
+       }
+
        if( base != NULL ) {
                char *tbase = ch_strdup( base );