X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Froot_dse.c;h=46f25f15a8ef5339f04ad52a0132606cbcd9650d;hb=d520cd607d452fe4809d86f37b299ee7665d0f12;hp=9761bdfbfcd8abb7cd39d8dd825c4da17d05716d;hpb=2fcaa15b90ec2be4d16f5519b7af6e5e1a60db86;p=openldap

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 9761bdfbfc..46f25f15a8 100644
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,13 +81,8 @@ root_dse_info(
 	e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
 
 	if( e == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR,
-			"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
-#endif
 		return LDAP_OTHER;
 	}
 
@@ -245,13 +240,8 @@ int read_root_dse_file( const char *fname )
 
 	usr_attr = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
 	if( usr_attr == NULL ) {
-#ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, ERR,
-			"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
-#else
 		Debug( LDAP_DEBUG_ANY,
 			"read_root_dse_file: SLAP_CALLOC failed", 0, 0, 0 );
-#endif
 		fclose( fp );
 		return LDAP_OTHER;
 	}