Revert ITS#3353 patch, it needs to be reworked.

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 9761bdfbfcd8abb7cd39d8dd825c4da17d05716d..642decbc88d850bc63855f95d17e01595b4f307c 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -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;
        }