IANA assigned OIDs

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 4038dfb7cf02a60419729d18c8110e93ba6c747e..8dd7e3a9161a586cfa17630024d2e4627a1d340e 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-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,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_MODIFY_INCREMENT),         /* Modify/increment */
+       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 */
 #endif
        {0,NULL}
 };
@@ -117,7 +119,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 ) ) {
@@ -151,7 +158,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;