ITS#3576 use actual backend (not glue instance) for restriction and

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index d5ef3f54d46ee72962d9490dc10776b87f69a216..dbe4f371c6abdf5907af62938be800397170115b 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-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,10 @@ static struct berval supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
        BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS), /* Language Tag Options */
        BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */
-
-#ifdef LDAP_DEVEL
+#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
        BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
+#endif
+#ifdef LDAP_FEATURE_MODIFY_INCREMENT
        BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif
        {0,NULL}
@@ -72,6 +73,8 @@ root_dse_info(
                = slap_schema.si_ad_supportedFeatures;
        AttributeDescription *ad_monitorContext
                = slap_schema.si_ad_monitorContext;
+       AttributeDescription *ad_configContext
+               = slap_schema.si_ad_configContext;
        AttributeDescription *ad_ref
                = slap_schema.si_ad_ref;
 
@@ -81,13 +84,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;
        }
 
@@ -124,7 +122,7 @@ root_dse_info(
                        /* no suffix! */
                        continue;
                }
-               if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
+               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 ) ) {
@@ -132,7 +130,15 @@ root_dse_info(
                        }
                        continue;
                }
-               if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) ) {
+               if ( SLAP_CONFIG( &backends[i] )) {
+                       vals[0] = backends[i].be_suffix[0];
+                       nvals[0] = backends[i].be_nsuffix[0];
+                       if( attr_merge( e, ad_configContext, vals, nvals ) ) {
+                               return LDAP_OTHER;
+                       }
+                       continue;
+               }
+               if ( SLAP_GLUE_SUBORDINATE( &backends[i] ) && !SLAP_GLUE_ADVERTISE( &backends[i] ) ) {
                        continue;
                }
                for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
@@ -245,13 +251,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;
        }