From: Howard Chu <hyc@openldap.org>
Date: Mon, 14 Mar 2005 20:04:42 +0000 (+0000)
Subject: ITS#3579 fix init order
X-Git-Tag: OPENLDAP_REL_ENG_2_2_24~11
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2c3b196d042f47ac9da9b935229652c71312590a;p=openldap

ITS#3579 fix init order
---

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index ac7dece690..198b9f1ee4 100644
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -275,6 +275,8 @@ slap_tool_init(
 		break;
 	}
 
+	ldap_syslog = 0;
+
 	if ( ldiffile == NULL ) {
 		ldiffp = tool == SLAPCAT ? stdout : stdin;
 
@@ -296,17 +298,17 @@ slap_tool_init(
 	}
 #endif
 		
-	rc = slap_init( mode, progname );
+	rc = slap_schema_init();
 
 	if ( rc != 0 ) {
-		fprintf( stderr, "%s: slap_init failed!\n", progname );
+		fprintf( stderr, "%s: slap_schema_init failed!\n", progname );
 		exit( EXIT_FAILURE );
 	}
 
-	rc = slap_schema_init();
+	rc = slap_init( mode, progname );
 
 	if ( rc != 0 ) {
-		fprintf( stderr, "%s: slap_schema_init failed!\n", progname );
+		fprintf( stderr, "%s: slap_init failed!\n", progname );
 		exit( EXIT_FAILURE );
 	}
 
@@ -322,8 +324,6 @@ slap_tool_init(
 		exit( EXIT_FAILURE );
 	}
 
-	ldap_syslog = 0;
-
 	switch ( tool ) {
 	case SLAPADD:
 	case SLAPCAT: