updated certificateExactMatch support,

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 90a7193467000c2842476fe11abb1bd7c5aa0f20..5357ed46fb5af7b9dfc852dd59796f67f930889e 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -43,9 +43,7 @@ root_dse_info(
 {
        Entry           *e;
        struct berval vals[2], *bv;
-#ifdef SLAP_NVALUES
        struct berval nvals[2];
-#endif
        int             i, j;
        char ** supportedSASLMechanisms;
 
@@ -69,9 +67,7 @@ root_dse_info(
                = slap_schema.si_ad_ref;
 
        vals[1].bv_val = NULL;
-#ifdef SLAP_NVALUES
        nvals[1].bv_val = NULL;
-#endif
 
        e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
 
@@ -100,38 +96,23 @@ root_dse_info(
 
        vals[0].bv_val = "top";
        vals[0].bv_len = sizeof("top")-1;
-#ifdef SLAP_NVALUES
-       if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
-       if( attr_merge( e, ad_objectClass, vals ) )
-#endif
+       if( attr_merge( e, ad_objectClass, vals, NULL ) )
        {
                return LDAP_OTHER;
        }
 
        vals[0].bv_val = "OpenLDAProotDSE";
        vals[0].bv_len = sizeof("OpenLDAProotDSE")-1;
-#ifdef SLAP_NVALUES
-       if( attr_merge( e, ad_objectClass, vals, vals ) )
-#else
-       if( attr_merge( e, ad_objectClass, vals ) )
-#endif
+       if( attr_merge( e, ad_objectClass, vals, NULL ) )
                return LDAP_OTHER;
-#ifdef SLAP_NVALUES
-       if( attr_merge( e, ad_structuralObjectClass, vals, vals ) )
-#else
-       if( attr_merge( e, ad_structuralObjectClass, vals ) )
-#endif
+       if( attr_merge( e, ad_structuralObjectClass, vals, NULL ) )
                return LDAP_OTHER;
 
        for ( i = 0; i < nbackends; i++ ) {
                if ( backends[i].be_flags & SLAP_BFLAG_MONITOR ) {
                        vals[0] = backends[i].be_suffix[0];
-#ifdef SLAP_NVALUES
+                       nvals[0] = backends[i].be_nsuffix[0];
                        if( attr_merge( e, ad_monitorContext, vals, nvals ) )
-#else
-                       if( attr_merge( e, ad_monitorContext, vals ) )
-#endif
                        {
                                return LDAP_OTHER;
                        }
@@ -142,11 +123,8 @@ root_dse_info(
                }
                for ( j = 0; backends[i].be_suffix[j].bv_val != NULL; j++ ) {
                        vals[0] = backends[i].be_suffix[j];
-#ifdef SLAP_NVALUES
-                       if( attr_merge( e, ad_namingContexts, vals, NULL ) )
-#else
-                       if( attr_merge( e, ad_namingContexts, vals ) )
-#endif
+                       nvals[0] = backends[i].be_nsuffix[0];
+                       if( attr_merge( e, ad_namingContexts, vals, nvals ) )
                        {
                                return LDAP_OTHER;
                        }
@@ -163,11 +141,7 @@ root_dse_info(
        /* supportedExtension */
        for ( i=0; (bv = get_supported_extop(i)) != NULL; i++ ) {
                vals[0] = *bv;
-#ifdef SLAP_NVALUES
                if( attr_merge( e, ad_supportedExtension, vals, NULL ) )
-#else
-               if( attr_merge( e, ad_supportedExtension, vals ) )
-#endif
                {
                        return LDAP_OTHER;
                }
@@ -177,11 +151,7 @@ root_dse_info(
        /* netscape supportedExtension */
        for ( i = 0; (bv = ns_get_supported_extop(i)) != NULL; i++ ) {
                vals[0] = *bv;
-#ifdef SLAP_NVALUES
                if( attr_merge( e, ad_supportedExtension, vals, NULL ))
-#else
-               if( attr_merge( e, ad_supportedExtension, vals ))
-#endif
                {
                        return LDAP_OTHER;
                }
@@ -189,12 +159,8 @@ root_dse_info(
 #endif /* LDAP_SLAPI */
 
        /* supportedFeatures */
-#ifdef SLAP_NVALUES
        if( attr_merge( e, ad_supportedFeatures,
-               supportedFeatures, supportedFeatures ) )
-#else
-       if( attr_merge( e, ad_supportedFeatures, supportedFeatures ) )
-#endif
+               supportedFeatures, NULL ) )
        {
                return LDAP_OTHER;
        }
@@ -211,11 +177,7 @@ root_dse_info(
                snprintf(buf, sizeof buf, "%d", i);
                vals[0].bv_val = buf;
                vals[0].bv_len = strlen( vals[0].bv_val );
-#ifdef SLAP_NVALUES
                if( attr_merge( e, ad_supportedLDAPVersion, vals, NULL ) )
-#else
-               if( attr_merge( e, ad_supportedLDAPVersion, vals ) )
-#endif
                {
                        return LDAP_OTHER;
                }
@@ -228,11 +190,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 );
-#ifdef SLAP_NVALUES
                        if( attr_merge( e, ad_supportedSASLMechanisms, vals, NULL ) )
-#else
-                       if( attr_merge( e, ad_supportedSASLMechanisms, vals ) )
-#endif
                        {
                                return LDAP_OTHER;
                        }
@@ -241,11 +199,7 @@ root_dse_info(
        }
 
        if ( default_referral != NULL ) {
-#ifdef SLAP_NVALUES
                if( attr_merge( e, ad_ref, default_referral, NULL /* FIXME */ ) )
-#else
-               if( attr_merge( e, ad_ref, default_referral ) )
-#endif
                {
                        return LDAP_OTHER;
                }
@@ -254,11 +208,8 @@ root_dse_info(
        if( usr_attr != NULL) {
                Attribute *a;
                for( a = usr_attr->e_attrs; a != NULL; a = a->a_next ) {
-#ifdef SLAP_NVALUES
-                       if( attr_merge( e, a->a_desc, a->a_vals, a->a_nvals ) )
-#else
-                       if( attr_merge( e, a->a_desc, a->a_vals ) )
-#endif
+                       if( attr_merge( e, a->a_desc, a->a_vals,
+                        (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
                        {
                                return LDAP_OTHER;
                        }
@@ -331,11 +282,8 @@ int read_root_dse_file( const char *fname )
                 */
 
                for(a = e->e_attrs; a != NULL; a = a->a_next) {
-#ifdef SLAP_NVALUES
-                       if( attr_merge( usr_attr, a->a_desc, a->a_vals, a->a_nvals ) )
-#else
-                       if( attr_merge( usr_attr, a->a_desc, a->a_vals ) )
-#endif
+                       if( attr_merge( usr_attr, a->a_desc, a->a_vals,
+                       (a->a_nvals == a->a_vals) ? NULL : a->a_nvals ) )
                        {
                                rc = LDAP_OTHER;
                                break;