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 b15725fce38c28308d59a92e042301ac28e5e697..642decbc88d850bc63855f95d17e01595b4f307c 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -1,13 +1,17 @@
+/* root_dse.c - Provides the Root DSA-Specific Entry */
 /* $OpenLDAP$ */
-/* root_dse.c - Provides the Root DSA-Specific Entry
+/* 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 are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -21,17 +25,19 @@
 #include "lber_pvt.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static struct berval supportedFeatures[] = {
-       BER_BVC(LDAP_FEATURE_ALL_OPERATIONAL_ATTRS), /* All Op Attrs (+) */
-       BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attrs List (+person) */
-       BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS), /* (&) and (|) search filters */
+       BER_BVC(LDAP_FEATURE_ALL_OP_ATTRS),                     /* All Op Attrs (+) */
+       BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS),        /* OCs in Attrs List (@class) */
+       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 */
+       BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),/* Language Range Options */
+
 #ifdef LDAP_DEVEL
-       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT), /* Modify/increment */
+       BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
+       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
 #endif
        {0,NULL}
 };
@@ -75,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;
        }
 
@@ -113,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 ) ) {
@@ -147,7 +153,7 @@ root_dse_info(
 
 #ifdef LDAP_SLAPI
        /* netscape supportedExtension */
-       for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
+       for ( i = 0; (bv = slapi_int_get_supported_extop(i)) != NULL; i++ ) {
                vals[0] = *bv;
                if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
                        return LDAP_OTHER;
@@ -234,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;
        }