upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#3917 revert prev commit

Browse source
This commit is contained in:
Howard Chu 2005-08-08 23:45:29 +00:00
parent 9f1703d0d3
commit a99e5846b3
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
servers/slapd/main.c
View file

@ -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;

7
servers/slapd/slapcommon.c
View file

@ -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 ) {