From 803d6d1204460dc29a8e4d2b8d26eb4f3a9e58f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Julio=20S=C3=A1nchez=20Fern=C3=A1ndez?= Date: Tue, 15 Jun 1999 12:26:07 +0000 Subject: [PATCH] Moved call of schema_init from main to read_config. --- servers/slapd/config.c | 7 +++++++ servers/slapd/main.c | 5 ----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/servers/slapd/config.c b/servers/slapd/config.c index 7243135fbd..dce9792855 100644 --- 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 fbc38f6ce0..e1e85ac113 100644 --- 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; -- 2.39.5