X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Finit.c;h=8cf3c7ae0e1fe3fc1874f783b5fe47cf1f68c278;hb=a17df0e810578d593808c6afeb0cdea55a65633c;hp=6a68e498eec835b3128163c3f5bb387582ebcedc;hpb=fc621a1c784f8307e339148b04b8c6c1e0406c32;p=openldap

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 6a68e498ee..8cf3c7ae0e 100644
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -94,7 +94,7 @@ slap_init( int mode, const char *name )
 
 	if ( slapMode != SLAP_UNDEFINED_MODE ) {
 		/* Make sure we write something to stderr */
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		 "%s init: init called twice (old=%d, new=%d)\n",
 		 name, slapMode, mode );
@@ -106,7 +106,7 @@ slap_init( int mode, const char *name )
 
 #ifdef SLAPD_MODULES
 	if ( module_init() != 0 ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: module_init failed\n",
 			name, 0, 0 );
@@ -115,7 +115,7 @@ slap_init( int mode, const char *name )
 #endif
 
 	if ( slap_schema_init( ) != 0 ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: slap_schema_init failed\n",
 		    name, 0, 0 );
@@ -176,7 +176,7 @@ slap_init( int mode, const char *name )
 		break;
 
 	default:
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 			"%s init: undefined mode (%d).\n", name, mode, 0 );
 
@@ -185,7 +185,7 @@ slap_init( int mode, const char *name )
 	}
 
 	if ( slap_controls_init( ) != 0 ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: slap_controls_init failed\n",
 		    name, 0, 0 );
@@ -203,7 +203,7 @@ slap_init( int mode, const char *name )
 #endif
 
 	if ( frontend_init() ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: frontend_init failed\n",
 		    name, 0, 0 );
@@ -211,7 +211,7 @@ slap_init( int mode, const char *name )
 	}
 
 	if ( overlay_init() ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: overlay_init failed\n",
 		    name, 0, 0 );
@@ -219,7 +219,7 @@ slap_init( int mode, const char *name )
 	}
 
 	if ( glue_sub_init() ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: glue/subordinate init failed\n",
 		    name, 0, 0 );
@@ -228,7 +228,7 @@ slap_init( int mode, const char *name )
 	}
 
 	if ( acl_init() ) {
-		ldap_debug |= 1;
+		slap_debug |= LDAP_DEBUG_NONE;
 		Debug( LDAP_DEBUG_ANY,
 		    "%s: acl_init failed\n",
 		    name, 0, 0 );