Moved call of schema_init from main to read_config.

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 7243135fbd837e2766ceabeb90dec019ab8c761b..dce9792855262c93f46cc7e2b3b65fe9b33d09a4 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -59,6 +59,13 @@ read_config( char *fname )
 
        Debug( LDAP_DEBUG_CONFIG, "reading config file %s\n", fname, 0, 0 );
 
+       if ( schema_init( ) != 0 ) {
+               Debug( LDAP_DEBUG_ANY,
+                   "error initializing the schema\n",
+                   0, 0, 0 );
+               return( 1 );
+       }
+
        fp_getline_init( &lineno );
 
        while ( (line = fp_getline( fp, &lineno )) != NULL ) {

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index fbc38f6ce05bfb55c071fa92cc4972944409bd47..e1e85ac1139c0f737d9f93db29ab7ed2fd2805e5 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -268,11 +268,6 @@ main( int argc, char **argv )
                goto destroy;
        }
 
-       if ( schema_init( ) != 0 ) {
-               rc = 1;
-               goto destroy;
-       }
-
        if ( read_config( configfile ) != 0 ) {
                rc = 1;
                goto destroy;