Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / back-meta / config.c

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 42f7365a2d85038e51809c081a0958b629e3eaa9..924ed88754fdb12282ecc511ff4b01b872c6bfd4 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -33,6 +33,10 @@
 #include "../back-ldap/back-ldap.h"
 #include "back-meta.h"
 
+#ifdef LDAP_DEVEL
+#define SLAP_AUTH_DN   1
+#endif
+
 static ConfigDriver meta_back_cf_gen;
 static ConfigLDAPadd meta_ldadd;
 static ConfigCfAdd meta_cfadd;
@@ -101,7 +105,7 @@ enum {
 };
 
 static ConfigTable metacfg[] = {
-       { "uri", "uri", 2, 2, 0,
+       { "uri", "uri", 2, 0, 0,
                ARG_MAGIC|LDAP_BACK_CFG_URI,
                meta_back_cf_gen, "( OLcfgDbAt:0.14 "
                        "NAME 'olcDbURI' "
@@ -1360,7 +1364,7 @@ meta_back_cf_gen( ConfigArgs *c )
                        if ( p1 ) {
                                strcpy( p2, p1 );
                        }
-                       value_add_one( &c->rvalue_vals, &bv );
+                       ber_bvarray_add( &c->rvalue_vals, &bv );
                        } break;
 
                case LDAP_BACK_CFG_ACL_AUTHCDN:
@@ -1500,6 +1504,7 @@ meta_back_cf_gen( ConfigArgs *c )
                                        ptr = lutil_strcopy( ptr, ",proxy-authz-non-critical" );
                                }
 
+#ifdef SLAP_AUTH_DN
                                switch ( mt->mt_idassert_flags & LDAP_BACK_AUTH_DN_MASK ) {
                                case LDAP_BACK_AUTH_DN_AUTHZID:
                                        ptr = lutil_strcopy( ptr, ",dn-authzid" );
@@ -1515,6 +1520,7 @@ meta_back_cf_gen( ConfigArgs *c )
 #endif
                                        break;
                                }
+#endif
 
                                bv.bv_len = ( ptr - bv.bv_val );
                                /* end-of-flags */
@@ -1708,7 +1714,7 @@ meta_back_cf_gen( ConfigArgs *c )
                         * connections associated with this target.
                         */
                        break;
-               
+
                case LDAP_BACK_CFG_IDASSERT_AUTHZFROM: {
                        BerVarray *bvp;