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 3babefa9ae83c2172324c9369f33b2fbd04dff14..642decbc88d850bc63855f95d17e01595b4f307c 100644 (file)
--- 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-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 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;
        }
 
@@ -119,7 +114,12 @@ root_dse_info(
        }
 
        for ( i = 0; i < nbackends; i++ ) {
-               if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+               if ( backends[i].be_suffix == NULL
+                               || backends[i].be_nsuffix == NULL ) {
+                       /* no suffix! */
+                       continue;
+               }
+               if ( SLAP_MONITOR( &backends[i] )) {
                        vals[0] = backends[i].be_suffix[0];
                        nvals[0] = backends[i].be_nsuffix[0];
                        if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {
@@ -240,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;
        }