X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fmain.c;h=2e0f46fb548267aff7e04aa577f2156d79bb7889;hb=17f95a3fd30247a0735a3526d85b46178304748d;hp=cea889cf7adfc9c38a657b481e40f431b4929b54;hpb=27fdd04153e886a882fe773c7f1bc1503ae0c132;p=openldap

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index cea889cf7a..2e0f46fb54 100644
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -1,9 +1,10 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 #include "portable.h"
+#include "slapi_common.h"
 
 #include <stdio.h>
 
@@ -16,7 +17,9 @@
 
 #include "ldap_pvt.h"
 
+
 #include "slap.h"
+#include "slapi.h"
 #include "lutil.h"
 #include "ldif.h"
 
@@ -81,7 +84,7 @@ static STRDISP	syslog_types[] = {
 	{ "LOCAL5", sizeof("LOCAL5"), LOG_LOCAL5 },
 	{ "LOCAL6", sizeof("LOCAL6"), LOG_LOCAL6 },
 	{ "LOCAL7", sizeof("LOCAL7"), LOG_LOCAL7 },
-	{ NULL }
+	{ NULL, 0, 0 }
 };
 
 static int   cnvt_str2int( char *, STRDISP_P, int );
@@ -177,8 +180,10 @@ int main( int argc, char **argv )
 		{
 			slap_debug = *i;
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-				   "main: new debug level from registry is: %d\n", slap_debug ));
+			lutil_log_initialize( argc, argv );
+			LDAP_LOG( SLAPD, INFO, 
+				"main: new debug level from registry is: %d\n", 
+				slap_debug, 0, 0 );
 #else
 			Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
 #endif
@@ -192,8 +197,8 @@ int main( int argc, char **argv )
 
 		    urls = ch_strdup(newUrls);
 #ifdef NEW_LOGGING
-		    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			       "main: new urls from registry: %s\n", urls ));
+		    LDAP_LOG( SLAPD, INFO, 
+				"main: new urls from registry: %s\n", urls, 0, 0 );
 #else
 		    Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n",
 			  urls, 0, 0);
@@ -206,8 +211,8 @@ int main( int argc, char **argv )
 		{
 			configfile = newConfigFile;
 #ifdef NEW_LOGGING
-			LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-				   "main: new config file from registry is: %s\n", configfile ));
+			LDAP_LOG( SLAPD, INFO, 
+				"main: new config file from registry is: %s\n", configfile, 0, 0 );
 #else
 			Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 );
 #endif
@@ -310,16 +315,15 @@ int main( int argc, char **argv )
 
 #ifdef NEW_LOGGING
 	lutil_log_initialize( argc, argv );
-#endif
-
+#else
 	lutil_set_debug_level( "slapd", slap_debug );
 	ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
 	ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);
 	ldif_debug = slap_debug;
+#endif
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-		   "%s", Versionstr ));
+	LDAP_LOG( SLAPD, INFO, "%s", Versionstr, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
 #endif
@@ -384,8 +388,7 @@ int main( int argc, char **argv )
 
 	if ( slap_schema_init( ) != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-			   "main: schema initialization error\n" ));
+		LDAP_LOG( OPERATION, CRIT, "main: schema initialization error\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 		    "schema initialization error\n",
@@ -405,7 +408,21 @@ int main( int argc, char **argv )
 	(void) ldap_pvt_tls_set_option( NULL, LDAP_OPT_X_TLS_REQUIRE_CERT, &rc );
 #endif
 
-	if ( read_config( configfile ) != 0 ) {
+#ifdef LDAP_SLAPI
+	if ( slapi_init() != 0 ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG( OPERATION, CRIT, "main: slapi initialization error\n", 0, 0, 0 );
+#else
+		Debug( LDAP_DEBUG_ANY,
+		    "slapi initialization error\n",
+		    0, 0, 0 );
+#endif
+
+		goto destroy;
+	}
+#endif /* LDAP_SLAPI */
+
+	if ( read_config( configfile, 0 ) != 0 ) {
 		rc = 1;
 		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 19 );
 
@@ -424,8 +441,7 @@ int main( int argc, char **argv )
 
 	if ( glue_sub_init( ) != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-			   "main: subordinate config error\n"));
+		LDAP_LOG( SLAPD, CRIT, "main: subordinate config error\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 		    "subordinate config error\n",
@@ -436,8 +452,7 @@ int main( int argc, char **argv )
 
 	if ( slap_schema_check( ) != 0 ) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-			   "main: schema prep error\n"));
+		LDAP_LOG( SLAPD, CRIT, "main: schema prep error\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 		    "schema prep error\n",
@@ -451,8 +466,7 @@ int main( int argc, char **argv )
 	rc = ldap_pvt_tls_init();
 	if( rc != 0) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-			   "main: tls init failed: %d\n", rc ));
+		LDAP_LOG( SLAPD, CRIT, "main: tls init failed: %d\n", rc, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 		    "main: TLS init failed: %d\n",
@@ -466,12 +480,11 @@ int main( int argc, char **argv )
 	rc = ldap_pvt_tls_init_def_ctx();
 	if( rc != 0) {
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-			   "main: tls init def ctx failed: %d\n", rc ));
+		LDAP_LOG( SLAPD, CRIT, "main: tls init def ctx failed: %d\n", rc, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY,
 		    "main: TLS init def ctx failed: %d\n",
-		    0, 0, 0 );
+		    rc, 0, 0 );
 #endif
 		rc = 1;
 		SERVICE_EXIT( ERROR_SERVICE_SPECIFIC_ERROR, 20 );
@@ -516,8 +529,7 @@ int main( int argc, char **argv )
 		FILE *fp;
 
 #ifdef NEW_LOGGING
-		LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-			   "main: slapd starting.\n" ));
+		LDAP_LOG( SLAPD, INFO, "main: slapd starting.\n", 0, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
 #endif
@@ -575,8 +587,7 @@ stop:
 #endif
 
 #ifdef NEW_LOGGING
-	LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
-		   "main: slapd stopped.\n" ));
+	LDAP_LOG( SLAPD, CRIT, "main: slapd stopped.\n", 0, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
 #endif
@@ -634,7 +645,7 @@ wait4child( int sig )
     errno = save_errno;
 }
 
-#endif /* SIGCHLD || SIGCLD */
+#endif /* LDAP_SIGCHLD */
 
 
 #ifdef LOG_LOCAL4