ITS#2962 - EBCDIC db_version string

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 5357ed46fb5af7b9dfc852dd59796f67f930889e..d5ef3f54d46ee72962d9490dc10776b87f69a216 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,15 +25,20 @@
 #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 Operational Attributes ("+") */
-       BER_BVC(LDAP_FEATURE_OBJECTCLASS_ATTRS), /* OCs in Attributes List */
-       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_SUBORDINATE_SCOPE),        /* "children" search scope */
+       BER_BVC(LDAP_FEATURE_MODIFY_INCREMENT),         /* Modify/increment */
+#endif
        {0,NULL}
 };
 
@@ -96,24 +105,29 @@ root_dse_info(
 
        vals[0].bv_val = "top";
        vals[0].bv_len = sizeof("top")-1;
-       if( attr_merge( e, ad_objectClass, vals, NULL ) )
-       {
+       if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
                return LDAP_OTHER;
        }
 
        vals[0].bv_val = "OpenLDAProotDSE";
        vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-       if( attr_merge( e, ad_objectClass, vals, NULL ) )
+       if( attr_merge( e, ad_objectClass, vals, NULL ) ) {
                return LDAP_OTHER;
-       if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) )
+       }
+       if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) ) {
                return LDAP_OTHER;
+       }
 
        for ( i = 0; i < nbackends; i++ ) {
+               if ( backends[i].be_suffix == NULL
+                               || backends[i].be_nsuffix == NULL ) {
+                       /* no suffix! */
+                       continue;
+               }
                if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
                        vals[0] = backends[i].be_suffix[0];
                        nvals[0] = backends[i].be_nsuffix[0];
-                       if( attr_merge( e, ad_monitorContext, vals, nvals ) )
-                       {
+                       if( attr_merge( e, ad_monitorContext, vals, nvals ) ) {
                                return LDAP_OTHER;
                        }
                        continue;
@@ -124,8 +138,7 @@ root_dse_info(
                for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
                        vals[0] = backends[i].be_suffix[j];
                        nvals[0] = backends[i].be_nsuffix[0];
-                       if( attr_merge( e, ad_namingContexts, vals, nvals ) )
-                       {
+                       if( attr_merge( e, ad_namingContexts, vals, nvals ) ) {
                                return LDAP_OTHER;
                        }
                }
@@ -139,29 +152,22 @@ root_dse_info(
        }
 
        /* supportedExtension */
-       for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
-               vals[0] = *bv;
-               if( attr_merge( e, ad_supportedExtension, vals, NULL ) )
-               {
-                       return LDAP_OTHER;
-               }
+       if ( exop_root_dse_info( e ) != 0 ) {
+               return LDAP_OTHER;
        }
 
 #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 ))
-               {
+               if( attr_merge( e, ad_supportedExtension, vals, NULL )) {
                        return LDAP_OTHER;
                }
        }
 #endif /* LDAP_SLAPI */
 
        /* supportedFeatures */
-       if( attr_merge( e, ad_supportedFeatures,
-               supportedFeatures, NULL ) )
-       {
+       if( attr_merge( e, ad_supportedFeatures, supportedFeatures, NULL ) ) {
                return LDAP_OTHER;
        }
 
@@ -177,8 +183,7 @@ root_dse_info(
                snprintf(buf, sizeof buf, "%d", i);
                vals[0].bv_val = buf;
                vals[0].bv_len = strlen( vals[0].bv_val );
-               if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) )
-               {
+               if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) ) {
                        return LDAP_OTHER;
                }
        }
@@ -190,8 +195,7 @@ root_dse_info(
                for ( i=0; supportedSASLMechanisms[i] != NULL; i++ ) {
                        vals[0].bv_val = supportedSASLMechanisms[i];
                        vals[0].bv_len = strlen( vals[0].bv_val );
-                       if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) )
-                       {
+                       if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) ) {
                                return LDAP_OTHER;
                        }
                }
@@ -199,8 +203,7 @@ root_dse_info(
        }
 
        if ( default_referral != NULL ) {
-               if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) )
-               {
+               if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) ) {
                        return LDAP_OTHER;
                }
        }
@@ -209,7 +212,7 @@ root_dse_info(
                Attribute *a;
                for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
                        if( attr_merge( e, a->a_desc, a->a_vals,
-                        (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
+                               (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
                        {
                                return LDAP_OTHER;
                        }
@@ -283,7 +286,7 @@ int read_root_dse_file( const char *fname )
 
                for(a = e->e_attrs; a != NULL; a = a->a_next) {
                        if( attr_merge( usr_attr, a->a_desc, a->a_vals,
-                       (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
+                               (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
                        {
                                rc = LDAP_OTHER;
                                break;