X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Fdynlist.c;h=4150659d24ee8370edafcb931efc71b70dea67ef;hb=5a6cd2403f70be749037464a1ffd4ca1b8e1b4ea;hp=a92a180d5680aa258208cf3c8fd9e27c5a4007de;hpb=81ecb0b1536785c830a264243c969e03a3858af6;p=openldap

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index a92a180d56..4150659d24 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -1,7 +1,8 @@
 /* dynlist.c - dynamic list overlay */
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
  * Portions Copyright 2004-2005 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -22,11 +23,24 @@
 
 #ifdef SLAPD_OVER_DYNLIST
 
+#if LDAP_VENDOR_VERSION_MINOR == X || LDAP_VENDOR_VERSION_MINOR > 3
+#if SLAPD_OVER_DYNGROUP != SLAPD_MOD_STATIC
+#define TAKEOVER_DYNGROUP
+#endif
+#else
+#if LDAP_VENDOR_VERSION_MINOR < 3
+#define OL_2_2_COMPAT
+#endif
+#endif
+
 #include <stdio.h>
 
 #include <ac/string.h>
 
 #include "slap.h"
+#ifndef OL_2_2_COMPAT
+#include "config.h"
+#endif
 #include "lutil.h"
 
 /* FIXME: the code differs if SLAP_OPATTRS is defined or not;
@@ -35,7 +49,7 @@
 /* FIXME: slap_anlist_no_attrs was introduced in 2.3; here it
  * is anticipated to allow using this overlay with 2.2. */
 
-#if LDAP_VENDOR_VERSION_MINOR != X && LDAP_VENDOR_VERSION_MINOR < 3
+#ifdef OL_2_2_COMPAT
 static AttributeName anlist_no_attrs[] = {
 	{ BER_BVC( LDAP_NO_ATTRS ), NULL, 0, NULL },
 	{ BER_BVNULL, NULL, 0, NULL }
@@ -44,46 +58,58 @@ static AttributeName anlist_no_attrs[] = {
 static AttributeName *slap_anlist_no_attrs = anlist_no_attrs;
 #endif
 
-typedef struct dynlist_info {
+static AttributeDescription *ad_dgIdentity;
+
+typedef struct dynlist_info_t {
 	ObjectClass		*dli_oc;
 	AttributeDescription	*dli_ad;
 	AttributeDescription	*dli_member_ad;
 	struct berval		dli_default_filter;
-} dynlist_info;
+	struct dynlist_info_t	*dli_next;
+} dynlist_info_t;
 
-static int
-dynlist_is_dynlist( Operation *op, SlapReply *rs )
+static dynlist_info_t *
+dynlist_is_dynlist_next( Operation *op, SlapReply *rs, dynlist_info_t *old_dli )
 {
 	slap_overinst	*on = (slap_overinst *)op->o_bd->bd_info;
-	dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
+	dynlist_info_t	*dli;
 
 	Attribute	*a;
 
+	if ( old_dli == NULL ) {
+		dli = (dynlist_info_t *)on->on_bi.bi_private;
+
+	} else {
+		dli = old_dli->dli_next;
+	}
+
 	a = attrs_find( rs->sr_entry->e_attrs, slap_schema.si_ad_objectClass );
 	if ( a == NULL ) {
 		/* FIXME: objectClass must be present; for non-storage
 		 * backends, like back-ldap, it needs to be added
 		 * to the requested attributes */
-		return 0;
+		return NULL;
 	}
 
-	if ( value_find_ex( slap_schema.si_ad_objectClass, 
-			SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
-			SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-			a->a_nvals, &dli->dli_oc->soc_cname,
-			op->o_tmpmemctx ) == 0 )
-	{
-		return 1;
+	for ( ; dli; dli = dli->dli_next ) {
+		if ( attr_valfind( a,
+				SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
+				SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+				&dli->dli_oc->soc_cname, NULL,
+				op->o_tmpmemctx ) == 0 )
+		{
+			return dli;
+		}
 	}
 
-	return 0;
+	return NULL;
 }
 
 static int
 dynlist_make_filter( Operation *op, struct berval *oldf, struct berval *newf )
 {
 	slap_overinst	*on = (slap_overinst *)op->o_bd->bd_info;
-	dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
+	dynlist_info_t	*dli = (dynlist_info_t *)on->on_bi.bi_private;
 
 	char		*ptr;
 
@@ -109,7 +135,7 @@ dynlist_make_filter( Operation *op, struct berval *oldf, struct berval *newf )
 }
 
 typedef struct dynlist_sc_t {
-	dynlist_info    *dlc_dli;
+	dynlist_info_t    *dlc_dli;
 	Entry		*dlc_e;
 } dynlist_sc_t;
 
@@ -163,6 +189,7 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 			mod.sm_type = dlc->dlc_dli->dli_member_ad->ad_cname;
 			mod.sm_values = vals;
 			mod.sm_nvalues = nvals;
+			mod.sm_numvals = 1;
 
 			(void)modify_add_values( e, &mod, /* permissive */ 1,
 					&text, textbuf, sizeof( textbuf ) );
@@ -181,7 +208,8 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 
 	for ( a = rs->sr_entry->e_attrs; a != NULL; a = a->a_next ) {
 		BerVarray	vals, nvals = NULL;
-		int		i, j;
+		int		i, j,
+				is_oc = a->a_desc == slap_schema.si_ad_objectClass;
 
 		/* if attribute is not requested, skip it */
 		if ( rs->sr_attrs == NULL ) {
@@ -221,8 +249,7 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 		}
 
 		/* test access to attribute */
-		for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ )
-			/* just count */ ;
+		i = a->a_numvals;
 
 		vals = op->o_tmpalloc( ( i + 1 ) * sizeof( struct berval ), op->o_tmpmemctx );
 		if ( a->a_nvals != a->a_vals ) {
@@ -230,6 +257,14 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 		}
 
 		for ( i = 0, j = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
+			if ( is_oc ) {
+				ObjectClass	*soc = oc_bvfind( &a->a_vals[i] );
+
+				if ( soc->soc_kind == LDAP_SCHEMA_STRUCTURAL ) {
+					continue;
+				}
+			}
+
 			if ( access_allowed( op, rs->sr_entry, a->a_desc,
 						&a->a_nvals[i], ACL_READ, &acl_state ) )
 			{
@@ -258,6 +293,7 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 			mod.sm_type = a->a_desc->ad_cname;
 			mod.sm_values = vals;
 			mod.sm_nvalues = nvals;
+			mod.sm_numvals = j;
 
 			(void)modify_add_values( e, &mod, /* permissive */ 1,
 					&text, textbuf, sizeof( textbuf ) );
@@ -272,24 +308,23 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 done:;
 	if ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) {
 		entry_free( rs->sr_entry );
+		rs->sr_entry = NULL;
+		rs->sr_flags ^= REP_ENTRY_MUSTBEFREED;
 	}
 
 	return 0;
 }
 	
 static int
-dynlist_send_entry( Operation *op, SlapReply *rs )
+dynlist_prepare_entry( Operation *op, SlapReply *rs, dynlist_info_t *dli )
 {
-	slap_overinst	*on = (slap_overinst *)op->o_bd->bd_info;
-	dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
-
-	Attribute	*a;
+	Attribute	*a, *id = NULL;
 	slap_callback	cb;
 	Operation	o = *op;
 	SlapReply	r = { REP_SEARCH };
 	struct berval	*url;
 	Entry		*e;
-	int		e_flags;
+	slap_mask_t	e_flags;
 	int		opattrs,
 			userattrs;
 	dynlist_sc_t	dlc = { 0 };
@@ -300,9 +335,32 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 		return SLAP_CB_CONTINUE;
 	}
 
-	e = entry_dup( rs->sr_entry );
+#ifndef SLAP_OPATTRS
+	opattrs = ( rs->sr_attrs == NULL ) ? 0 : an_find( rs->sr_attrs, &AllOper );
+	userattrs = ( rs->sr_attrs == NULL ) ? 1 : an_find( rs->sr_attrs, &AllUser );
+#else /* SLAP_OPATTRS */
+	opattrs = SLAP_OPATTRS( rs->sr_attr_flags );
+	userattrs = SLAP_USERATTRS( rs->sr_attr_flags );
+#endif /* SLAP_OPATTRS */
+
+	/* Don't generate member list if it wasn't requested */
+	if ( dli->dli_member_ad && !userattrs && !ad_inlist( dli->dli_member_ad, rs->sr_attrs ) ) {
+		return SLAP_CB_CONTINUE;
+	}
+
+	if ( !( rs->sr_flags & REP_ENTRY_MODIFIABLE ) ) {
+		e = entry_dup( rs->sr_entry );
+	} else {
+		e = rs->sr_entry;
+	}
 	e_flags = rs->sr_flags | ( REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED );
 
+	if ( ad_dgIdentity && ( id = attrs_find( e->e_attrs, ad_dgIdentity ))) {
+		o.o_dn = id->a_vals[0];
+		o.o_ndn = id->a_nvals[0];
+		o.o_groups = NULL;
+	}
+
 	dlc.dlc_e = e;
 	dlc.dlc_dli = dli;
 	cb.sc_private = &dlc;
@@ -316,14 +374,6 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 	o.ors_tlimit = SLAP_NO_LIMIT;
 	o.ors_slimit = SLAP_NO_LIMIT;
 
-#ifndef SLAP_OPATTRS
-	opattrs = ( rs->sr_attrs == NULL ) ? 0 : an_find( rs->sr_attrs, &AllOper );
-	userattrs = ( rs->sr_attrs == NULL ) ? 1 : an_find( rs->sr_attrs, &AllUser );
-#else /* SLAP_OPATTRS */
-	opattrs = SLAP_OPATTRS( rs->sr_attr_flags );
-	userattrs = SLAP_USERATTRS( rs->sr_attr_flags );
-#endif /* SLAP_OPATTRS */
-
 	for ( url = a->a_nvals; !BER_BVISNULL( url ); url++ ) {
 		LDAPURLDesc	*lud = NULL;
 		int		i, j;
@@ -341,9 +391,9 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 			continue;
 		}
 
-		if ( lud->lud_host ) {
+		if ( lud->lud_host != NULL ) {
 			/* FIXME: host not allowed; reject as illegal? */
-			Debug( LDAP_DEBUG_ANY, "dynlist_send_entry(\"%s\"): "
+			Debug( LDAP_DEBUG_ANY, "dynlist_prepare_entry(\"%s\"): "
 				"illegal URI \"%s\"\n",
 				e->e_name.bv_val, url->bv_val, 0 );
 			goto cleanup;
@@ -356,6 +406,7 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 			 * this can be useful in case of a database serving
 			 * the empty suffix */
 			BER_BVSTR( &dn, "" );
+
 		} else {
 			ber_str2bv( lud->lud_dn, 0, 0, &dn );
 		}
@@ -367,6 +418,8 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 		o.ors_scope = lud->lud_scope;
 
 		if ( dli->dli_member_ad != NULL ) {
+			/* if ( lud->lud_attrs != NULL ),
+			 * the URL should be ignored */
 			o.ors_attrs = slap_anlist_no_attrs;
 
 		} else if ( lud->lud_attrs == NULL ) {
@@ -424,6 +477,7 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 		if ( lud->lud_filter == NULL ) {
 			ber_dupbv_x( &o.ors_filterstr,
 					&dli->dli_default_filter, op->o_tmpmemctx );
+
 		} else {
 			struct berval	flt;
 			ber_str2bv( lud->lud_filter, 0, 0, &flt );
@@ -437,7 +491,7 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 			goto cleanup;
 		}
 		
-		o.o_bd = select_backend( &o.o_req_ndn, 0, 1 );
+		o.o_bd = select_backend( &o.o_req_ndn, 1 );
 		if ( o.o_bd && o.o_bd->be_search ) {
 #ifdef SLAP_OPATTRS
 			r.sr_attr_flags = slap_attr_flags( o.ors_attrs );
@@ -446,6 +500,9 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 		}
 
 cleanup:;
+		if ( id ) {
+			slap_op_groups_free( &o );
+		}
 		if ( o.ors_filter ) {
 			filter_free_x( &o, o.ors_filter );
 		}
@@ -460,13 +517,10 @@ cleanup:;
 		if ( !BER_BVISNULL( &o.o_req_ndn ) ) {
 			op->o_tmpfree( o.o_req_ndn.bv_val, op->o_tmpmemctx );
 		}
-		if ( o.ors_filterstr.bv_val != lud->lud_filter ) {
-			op->o_tmpfree( o.ors_filterstr.bv_val, op->o_tmpmemctx );
-			lud->lud_filter = NULL;
-		}
-		if ( lud ) {
-			ldap_free_urldesc( lud );
-		}
+		assert( BER_BVISNULL( &o.ors_filterstr )
+			|| o.ors_filterstr.bv_val != lud->lud_filter );
+		op->o_tmpfree( o.ors_filterstr.bv_val, op->o_tmpmemctx );
+		ldap_free_urldesc( lud );
 	}
 
 	rs->sr_entry = e;
@@ -493,82 +547,151 @@ static int
 dynlist_compare( Operation *op, SlapReply *rs )
 {
 	slap_overinst	*on = (slap_overinst *)op->o_bd->bd_info;
-	dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
-
-	Attribute	*a;
-	slap_callback	cb;
-	Operation	o = *op;
-	SlapReply	r = { REP_SEARCH };
-	AttributeName	an[2];
-	int		rc;
-	dynlist_sc_t	dlc = { 0 };
-
-	dlc.dlc_dli = dli;
-	cb.sc_private = &dlc;
-	cb.sc_response = dynlist_sc_save_entry;
-	cb.sc_cleanup = NULL;
-	cb.sc_next = NULL;
-	o.o_callback = &cb;
+	dynlist_info_t	*dli = (dynlist_info_t *)on->on_bi.bi_private;
+	Operation o = *op;
+	Entry *e = NULL;
+
+	for ( ; dli != NULL; dli = dli->dli_next ) {
+		if ( op->oq_compare.rs_ava->aa_desc == dli->dli_member_ad ) {
+			/* This compare is for one of the attributes we're
+			 * interested in. We'll use slapd's existing dyngroup
+			 * evaluator to get the answer we want.
+			 */
+			struct berval *id = NULL;
+
+			o.o_do_not_cache = 1;
+
+			if ( ad_dgIdentity && backend_attribute( &o, NULL, &o.o_req_ndn,
+				ad_dgIdentity, &id, ACL_READ ) == LDAP_SUCCESS ) {
+				o.o_dn = *id;
+				o.o_ndn = *id;
+				o.o_groups = NULL; /* authz changed, invalidate cached groups */
+			}
+			rs->sr_err = backend_group( &o, NULL, &o.o_req_ndn,
+				&o.oq_compare.rs_ava->aa_value, dli->dli_oc, dli->dli_ad );
+			switch ( rs->sr_err ) {
+			case LDAP_SUCCESS:
+				rs->sr_err = LDAP_COMPARE_TRUE;
+				break;
+
+			case LDAP_NO_SUCH_OBJECT:
+				/* NOTE: backend_group() returns noSuchObject
+				 * if op_ndn does not exist; however, since
+				 * dynamic list expansion means that the
+				 * member attribute is virtually present, the
+				 * non-existence of the asserted value implies
+				 * the assertion is FALSE rather than
+				 * UNDEFINED */
+				rs->sr_err = LDAP_COMPARE_FALSE;
+				break;
+			}
 
-	o.o_tag = LDAP_REQ_SEARCH;
-	o.ors_limit = NULL;
-	o.ors_tlimit = SLAP_NO_LIMIT;
-	o.ors_slimit = SLAP_NO_LIMIT;
+			if ( id ) ber_bvarray_free_x( id, o.o_tmpmemctx );
 
-	o.o_bd = select_backend( &o.o_req_ndn, 0, 1 );
-	if ( !o.o_bd || !o.o_bd->be_search ) {
-		return SLAP_CB_CONTINUE;
+			return SLAP_CB_CONTINUE;
+		}
 	}
 
-	BER_BVSTR( &o.ors_filterstr, "(objectClass=*)" );
-	o.ors_filter = str2filter_x( op, o.ors_filterstr.bv_val );
-	if ( o.ors_filter == NULL ) {
-		/* FIXME: error? */
+	if ( overlay_entry_get_ov( &o, &o.o_req_ndn, NULL, NULL, 0, &e, on ) !=
+		LDAP_SUCCESS || e == NULL ) {
 		return SLAP_CB_CONTINUE;
 	}
+	if ( ad_dgIdentity ) {
+		Attribute *id = attrs_find( e->e_attrs, ad_dgIdentity );
+		if ( id ) {
+			o.o_dn = id->a_vals[0];
+			o.o_ndn = id->a_nvals[0];
+			o.o_groups = NULL;
+		}
+	}
+	dli = (dynlist_info_t *)on->on_bi.bi_private;
+	for ( ; dli != NULL && rs->sr_err != LDAP_COMPARE_TRUE; dli = dli->dli_next ) {
+		Attribute	*a;
+		slap_callback	cb;
+		SlapReply	r = { REP_SEARCH };
+		AttributeName	an[2];
+		int		rc;
+		dynlist_sc_t	dlc = { 0 };
 
-	o.ors_scope = LDAP_SCOPE_BASE;
-	o.ors_deref = LDAP_DEREF_NEVER;
-	an[0].an_name = op->orc_ava->aa_desc->ad_cname;
-	an[0].an_desc = op->orc_ava->aa_desc;
-	BER_BVZERO( &an[1].an_name );
-	o.ors_attrs = an;
-	o.ors_attrsonly = 0;
+		if ( !is_entry_objectclass_or_sub( e, dli->dli_oc ))
+			continue;
 
-	rc = o.o_bd->be_search( &o, &r );
-	filter_free_x( &o, o.ors_filter );
+		/* if the entry has the right objectClass, generate
+		 * the dynamic list and compare */
+		dlc.dlc_dli = dli;
+		cb.sc_private = &dlc;
+		cb.sc_response = dynlist_sc_save_entry;
+		cb.sc_cleanup = NULL;
+		cb.sc_next = NULL;
+		o.o_callback = &cb;
+
+		o.o_tag = LDAP_REQ_SEARCH;
+		o.ors_limit = NULL;
+		o.ors_tlimit = SLAP_NO_LIMIT;
+		o.ors_slimit = SLAP_NO_LIMIT;
+
+		o.o_bd = select_backend( &o.o_req_ndn, 1 );
+		if ( !o.o_bd || !o.o_bd->be_search ) {
+			goto release;
+		}
 
-	if ( rc != 0 ) {
-		return rc;
-	}
+		o.ors_filterstr = *slap_filterstr_objectClass_pres;
+		o.ors_filter = (Filter *) slap_filter_objectClass_pres;
 
-	if ( dlc.dlc_e != NULL ) {
-		r.sr_entry = dlc.dlc_e;
-	}
+		o.ors_scope = LDAP_SCOPE_BASE;
+		o.ors_deref = LDAP_DEREF_NEVER;
+		an[0].an_name = op->orc_ava->aa_desc->ad_cname;
+		an[0].an_desc = op->orc_ava->aa_desc;
+		BER_BVZERO( &an[1].an_name );
+		o.ors_attrs = an;
+		o.ors_attrsonly = 0;
 
-	if ( r.sr_err != LDAP_SUCCESS || r.sr_entry == NULL ) {
-		/* error? */
-		return SLAP_CB_CONTINUE;
-	}
+		o.o_acl_priv = ACL_COMPARE;
 
-	/* if we're here, we got a match... */
-	rs->sr_err = LDAP_COMPARE_FALSE;
-	for ( a = attrs_find( r.sr_entry->e_attrs, op->orc_ava->aa_desc );
-		a != NULL;
-		a = attrs_find( a->a_next, op->orc_ava->aa_desc ) )
-	{
-		if ( value_find_ex( op->orc_ava->aa_desc,
-			SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
-				SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-			a->a_nvals, &op->orc_ava->aa_value, op->o_tmpmemctx ) == 0 )
+		rc = o.o_bd->be_search( &o, &r );
+
+		if ( o.o_dn.bv_val != op->o_dn.bv_val ) {
+			slap_op_groups_free( &o );
+		}
+
+		if ( rc != 0 ) {
+			goto release;
+		}
+
+		if ( dlc.dlc_e != NULL ) {
+			r.sr_entry = dlc.dlc_e;
+		}
+
+		if ( r.sr_err != LDAP_SUCCESS || r.sr_entry == NULL ) {
+			/* error? */
+			goto release;
+		}
+
+		for ( a = attrs_find( r.sr_entry->e_attrs, op->orc_ava->aa_desc );
+			a != NULL;
+			a = attrs_find( a->a_next, op->orc_ava->aa_desc ) )
 		{
-			rs->sr_err = LDAP_COMPARE_TRUE;
-			break;
+			/* if we're here, we got a match... */
+			rs->sr_err = LDAP_COMPARE_FALSE;
+
+			if ( attr_valfind( a,
+				SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
+					SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
+				&op->orc_ava->aa_value, NULL, op->o_tmpmemctx ) == 0 )
+			{
+				rs->sr_err = LDAP_COMPARE_TRUE;
+				break;
+			}
+		}
+
+		if ( r.sr_flags & REP_ENTRY_MUSTBEFREED ) {
+			entry_free( r.sr_entry );
 		}
 	}
 
-	if ( r.sr_flags & REP_ENTRY_MUSTBEFREED ) {
-		entry_free( r.sr_entry );
+release:;
+	if ( e != NULL ) {
+		overlay_entry_release_ov( &o, e, 0, on );
 	}
 
 	return SLAP_CB_CONTINUE;
@@ -577,18 +700,39 @@ dynlist_compare( Operation *op, SlapReply *rs )
 static int
 dynlist_response( Operation *op, SlapReply *rs )
 {
+	dynlist_info_t	*dli;
+
 	switch ( op->o_tag ) {
 	case LDAP_REQ_SEARCH:
 		if ( rs->sr_type == REP_SEARCH && !get_manageDSAit( op ) )
 		{
-			if ( dynlist_is_dynlist( op, rs ) ) {
-				return dynlist_send_entry( op, rs );
+			int	rc = LDAP_OTHER;
+
+			for ( dli = dynlist_is_dynlist_next( op, rs, NULL );
+				dli;
+				dli = dynlist_is_dynlist_next( op, rs, dli ) )
+			{
+				rc = dynlist_prepare_entry( op, rs, dli );
+			}
+
+			if ( rc != LDAP_OTHER ) {
+				return rc;
 			}
 		}
 		break;
 
 	case LDAP_REQ_COMPARE:
-		if ( rs->sr_err == LDAP_NO_SUCH_ATTRIBUTE ) {
+		switch ( rs->sr_err ) {
+		/* NOTE: we waste a few cycles running the dynamic list
+		 * also when the result is FALSE, which occurs if the
+		 * dynamic entry itself contains the AVA attribute  */
+		/* FIXME: this approach is less than optimal; a dedicated
+		 * compare op should be implemented, that fetches the
+		 * entry, checks if it has the appropriate objectClass
+		 * and, in case, runs a compare thru all the URIs,
+		 * stopping at the first positive occurrence; see ITS#3756 */
+		case LDAP_COMPARE_FALSE:
+		case LDAP_NO_SUCH_ATTRIBUTE:
 			return dynlist_compare( op, rs );
 		}
 		break;
@@ -600,62 +744,200 @@ dynlist_response( Operation *op, SlapReply *rs )
 	return SLAP_CB_CONTINUE;
 }
 
+static int
+dynlist_build_def_filter( dynlist_info_t *dli )
+{
+	char	*ptr;
+
+	dli->dli_default_filter.bv_len = STRLENOF( "(!(objectClass=" "))" )
+		+ dli->dli_oc->soc_cname.bv_len;
+	dli->dli_default_filter.bv_val = ch_malloc( dli->dli_default_filter.bv_len + 1 );
+	if ( dli->dli_default_filter.bv_val == NULL ) {
+		Debug( LDAP_DEBUG_ANY, "dynlist_db_open: malloc failed.\n",
+			0, 0, 0 );
+		return -1;
+	}
+
+	ptr = lutil_strcopy( dli->dli_default_filter.bv_val, "(!(objectClass=" );
+	ptr = lutil_strcopy( ptr, dli->dli_oc->soc_cname.bv_val );
+	ptr = lutil_strcopy( ptr, "))" );
+
+	assert( dli->dli_default_filter.bv_len == ptr - dli->dli_default_filter.bv_val );
+
+	return 0;
+}
+
+#ifdef OL_2_2_COMPAT
 static int
 dynlist_db_config(
-    BackendDB	*be,
-    const char	*fname,
-    int		lineno,
-    int		argc,
-    char	**argv
-)
+	BackendDB	*be,
+	const char	*fname,
+	int		lineno,
+	int		argc,
+	char		**argv )
 {
 	slap_overinst	*on = (slap_overinst *)be->bd_info;
-	dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
 
 	int		rc = 0;
 
-	if ( strcasecmp( argv[0], "dynlist-oc" ) == 0 ) {
-		if ( argc != 2 ) {
-			fprintf( stderr, "dynlist-oc <oc>\n" );
+	if ( strcasecmp( argv[0], "dynlist-attrset" ) == 0 ) {
+		dynlist_info_t		**dlip;
+		ObjectClass		*oc;
+		AttributeDescription	*ad = NULL,
+					*member_ad = NULL;
+		const char		*text;
+
+		if ( argc < 3 || argc > 4 ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"invalid arg number #%d.\n",
+				fname, lineno, argc );
 			return 1;
 		}
-		dli->dli_oc = oc_find( argv[1] );
-		if ( dli->dli_oc == NULL ) {
-			fprintf( stderr, "dynlist-oc <oc>: "
-					"unable to find ObjectClass "
-					"\"%s\"\n", argv[1] );
+
+		oc = oc_find( argv[1] );
+		if ( oc == NULL ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"unable to find ObjectClass \"%s\"\n",
+				fname, lineno, argv[ 1 ] );
 			return 1;
 		}
 
-	} else if ( strcasecmp( argv[0], "dynlist-ad" ) == 0 ) {
-		const char	*text;
+		rc = slap_str2ad( argv[2], &ad, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"unable to find AttributeDescription \"%s\"\n",
+				fname, lineno, argv[2] );
+			return 1;
+		}
 
-		if ( argc != 2 ) {
-			fprintf( stderr, "dynlist-ad <ad>\n" );
+		if ( !is_at_subtype( ad->ad_type, slap_schema.si_ad_labeledURI->ad_type ) ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"AttributeDescription \"%s\" "
+				"must be a subtype of \"labeledURI\"\n",
+				fname, lineno, argv[2] );
 			return 1;
 		}
-		dli->dli_ad = NULL;
-		rc = slap_str2ad( argv[1], &dli->dli_ad, &text );
-		if ( rc != LDAP_SUCCESS ) {
-			fprintf( stderr, "dynlist-ad <ad>: "
-					"unable to find AttributeDescription "
-					"\"%s\"\n", argv[1] );
+
+		if ( argc == 4 ) {
+			rc = slap_str2ad( argv[3], &member_ad, &text );
+			if ( rc != LDAP_SUCCESS ) {
+				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+					"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+					"unable to find AttributeDescription \"%s\"\n",
+					fname, lineno, argv[3] );
+				return 1;
+			}
+		}
+
+		for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+			*dlip; dlip = &(*dlip)->dli_next )
+		{
+			/* The same URL attribute / member attribute pair
+			 * cannot be repeated */
+			if ( (*dlip)->dli_ad == ad && (*dlip)->dli_member_ad == member_ad ) {
+				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+					"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+					"URL attributeDescription \"%s\" already mapped.\n",
+					fname, lineno, ad->ad_cname.bv_val );
+#if 0
+				/* make it a warning... */
+				return 1;
+#endif
+			}
+		}
+
+		*dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
+		(*dlip)->dli_oc = oc;
+		(*dlip)->dli_ad = ad;
+		(*dlip)->dli_member_ad = member_ad;
+
+		if ( dynlist_build_def_filter( *dlip ) ) {
+			ch_free( *dlip );
+			*dlip = NULL;
 			return 1;
 		}
 
-	} else if ( strcasecmp( argv[0], "dynlist-member-ad" ) == 0 ) {
-		const char	*text;
+	/* allow dyngroup syntax */
+	} else if ( strcasecmp( argv[0], "dynlist-attrpair" ) == 0 ) {
+		dynlist_info_t		**dlip;
+		ObjectClass		*oc;
+		AttributeDescription	*ad = NULL,
+					*member_ad = NULL;
+		const char		*text;
+
+		if ( argc != 3 ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"invalid arg number #%d.\n",
+				fname, lineno, argc );
+			return 1;
+		}
 
-		if ( argc != 2 ) {
-			fprintf( stderr, "dynlist-member-ad <ad>\n" );
+		oc = oc_find( "groupOfURLs" );
+		if ( oc == NULL ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"unable to find default ObjectClass \"groupOfURLs\"\n",
+				fname, lineno, 0 );
 			return 1;
 		}
-		dli->dli_member_ad = NULL;
-		rc = slap_str2ad( argv[1], &dli->dli_member_ad, &text );
+
+		rc = slap_str2ad( argv[1], &member_ad, &text );
 		if ( rc != LDAP_SUCCESS ) {
-			fprintf( stderr, "dynlist-member-ad <ad>: "
-					"unable to find AttributeDescription "
-					"\"%s\"\n", argv[1] );
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"unable to find AttributeDescription \"%s\"\n",
+				fname, lineno, argv[1] );
+			return 1;
+		}
+
+		rc = slap_str2ad( argv[2], &ad, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"unable to find AttributeDescription \"%s\"\n",
+				fname, lineno, argv[2] );
+			return 1;
+		}
+
+		if ( !is_at_subtype( ad->ad_type, slap_schema.si_ad_labeledURI->ad_type ) ) {
+			Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"AttributeDescription \"%s\" "
+				"must be a subtype of \"labeledURI\"\n",
+				fname, lineno, argv[2] );
+			return 1;
+		}
+
+		for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+			*dlip; dlip = &(*dlip)->dli_next )
+		{
+			/* The same URL attribute / member attribute pair
+			 * cannot be repeated */
+			if ( (*dlip)->dli_ad == ad && (*dlip)->dli_member_ad == member_ad ) {
+				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+					"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+					"URL attributeDescription \"%s\" already mapped.\n",
+					fname, lineno, ad->ad_cname.bv_val );
+#if 0
+				/* make it a warning... */
+				return 1;
+#endif
+			}
+		}
+
+		*dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
+		(*dlip)->dli_oc = oc;
+		(*dlip)->dli_ad = ad;
+		(*dlip)->dli_member_ad = member_ad;
+
+		if ( dynlist_build_def_filter( *dlip ) ) {
+			ch_free( *dlip );
+			*dlip = NULL;
 			return 1;
 		}
 
@@ -666,90 +948,480 @@ dynlist_db_config(
 	return rc;
 }
 
+#else
+enum {
+	DL_ATTRSET = 1,
+	DL_ATTRPAIR,
+	DL_ATTRPAIR_COMPAT,
+	DL_LAST
+};
+
+static ConfigDriver	dl_cfgen;
+
+static ConfigTable dlcfg[] = {
+	{ "dynlist-attrset", "group-oc> <URL-ad> <member-ad",
+		3, 4, 0, ARG_MAGIC|DL_ATTRSET, dl_cfgen,
+		"( OLcfgOvAt:8.1 NAME 'olcDLattrSet' "
+			"DESC 'Dynamic list: <group objectClass>, <URL attributeDescription>, <member attributeDescription>' "
+			"EQUALITY caseIgnoreMatch "
+			"SYNTAX OMsDirectoryString "
+			"X-ORDERED 'VALUES' )",
+			NULL, NULL },
+	{ "dynlist-attrpair", "member-ad> <URL-ad",
+		3, 3, 0, ARG_MAGIC|DL_ATTRPAIR, dl_cfgen,
+			NULL, NULL, NULL },
+#ifdef TAKEOVER_DYNGROUP
+	{ "attrpair", "member-ad> <URL-ad",
+		3, 3, 0, ARG_MAGIC|DL_ATTRPAIR_COMPAT, dl_cfgen,
+			NULL, NULL, NULL },
+#endif
+	{ NULL, NULL, 0, 0, 0, ARG_IGNORED }
+};
+
+static ConfigOCs dlocs[] = {
+	{ "( OLcfgOvOc:8.1 "
+		"NAME 'olcDynamicList' "
+		"DESC 'Dynamic list configuration' "
+		"SUP olcOverlayConfig "
+		"MAY olcDLattrSet )",
+		Cft_Overlay, dlcfg, NULL, NULL },
+	{ NULL, 0, NULL }
+};
+
 static int
-dynlist_db_init(
-	BackendDB *be
-)
+dl_cfgen( ConfigArgs *c )
 {
-	slap_overinst	*on = (slap_overinst *) be->bd_info;
-	dynlist_info	*dli;
+	slap_overinst	*on = (slap_overinst *)c->bi;
+	dynlist_info_t	*dli = (dynlist_info_t *)on->on_bi.bi_private;
+
+	int		rc = 0, i;
+
+	if ( c->op == SLAP_CONFIG_EMIT ) {
+		switch( c->type ) {
+		case DL_ATTRSET:
+			for ( i = 0; dli; i++, dli = dli->dli_next ) {
+				struct berval	bv;
+				char		*ptr = c->cr_msg;
+
+				assert( dli->dli_oc != NULL );
+				assert( dli->dli_ad != NULL );
+
+				ptr += snprintf( c->cr_msg, sizeof( c->cr_msg ),
+					SLAP_X_ORDERED_FMT "%s %s", i,
+					dli->dli_oc->soc_cname.bv_val,
+					dli->dli_ad->ad_cname.bv_val );
+
+				if ( dli->dli_member_ad != NULL ) {
+					ptr[ 0 ] = ' ';
+					ptr++;
+					ptr = lutil_strcopy( ptr, dli->dli_member_ad->ad_cname.bv_val );
+				}
 
-	dli = (dynlist_info *)ch_malloc( sizeof( dynlist_info ) );
-	memset( dli, 0, sizeof( dynlist_info ) );
+				bv.bv_val = c->cr_msg;
+				bv.bv_len = ptr - bv.bv_val;
+				value_add_one( &c->rvalue_vals, &bv );
+			}
+			break;
 
-	on->on_bi.bi_private = (void *)dli;
+		case DL_ATTRPAIR_COMPAT:
+		case DL_ATTRPAIR:
+			rc = 1;
+			break;
 
-	return 0;
+		default:
+			rc = 1;
+			break;
+		}
+
+		return rc;
+
+	} else if ( c->op == LDAP_MOD_DELETE ) {
+		switch( c->type ) {
+		case DL_ATTRSET:
+			if ( c->valx < 0 ) {
+				dynlist_info_t	*dli_next;
+
+				for ( dli_next = dli; dli_next; dli = dli_next ) {
+					dli_next = dli->dli_next;
+
+					ch_free( dli->dli_default_filter.bv_val );
+					ch_free( dli );
+				}
+
+				on->on_bi.bi_private = NULL;
+
+			} else {
+				dynlist_info_t	**dlip;
+
+				for ( i = 0, dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+					i < c->valx; i++ )
+				{
+					if ( *dlip == NULL ) {
+						return 1;
+					}
+					dlip = &(*dlip)->dli_next;
+				}
+
+				dli = *dlip;
+				*dlip = dli->dli_next;
+				ch_free( dli->dli_default_filter.bv_val );
+				ch_free( dli );
+
+				dli = (dynlist_info_t *)on->on_bi.bi_private;
+			}
+			break;
+
+		case DL_ATTRPAIR_COMPAT:
+		case DL_ATTRPAIR:
+			rc = 1;
+			break;
+
+		default:
+			rc = 1;
+			break;
+		}
+
+		return rc;
+	}
+
+	switch( c->type ) {
+	case DL_ATTRSET: {
+		dynlist_info_t		**dlip,
+					*dli_next = NULL;
+		ObjectClass		*oc = NULL;
+		AttributeDescription	*ad = NULL,
+					*member_ad = NULL;
+		const char		*text;
+
+		oc = oc_find( c->argv[ 1 ] );
+		if ( oc == NULL ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"unable to find ObjectClass \"%s\"",
+				c->argv[ 1 ] );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		rc = slap_str2ad( c->argv[ 2 ], &ad, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"unable to find AttributeDescription \"%s\"",
+				c->argv[ 2 ] );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		if ( !is_at_subtype( ad->ad_type, slap_schema.si_ad_labeledURI->ad_type ) ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"AttributeDescription \"%s\" "
+				"must be a subtype of \"labeledURI\"",
+				c->argv[ 2 ] );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		if ( c->argc == 4 ) {
+			rc = slap_str2ad( c->argv[ 3 ], &member_ad, &text );
+			if ( rc != LDAP_SUCCESS ) {
+				snprintf( c->cr_msg, sizeof( c->cr_msg ),
+					"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+					"unable to find AttributeDescription \"%s\"\n",
+					c->argv[ 3 ] );
+				Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+					c->log, c->cr_msg, 0 );
+				return 1;
+			}
+		}
+
+		for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+			*dlip; dlip = &(*dlip)->dli_next )
+		{
+			/* The same URL attribute / member attribute pair
+			 * cannot be repeated */
+			if ( (*dlip)->dli_ad == ad && (*dlip)->dli_member_ad == member_ad ) {
+				snprintf( c->cr_msg, sizeof( c->cr_msg ),
+					"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+					"URL attributeDescription \"%s\" already mapped.\n",
+					ad->ad_cname.bv_val );
+				Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+					c->log, c->cr_msg, 0 );
+#if 0
+				/* make it a warning... */
+				return 1;
+#endif
+			}
+		}
+
+		if ( c->valx > 0 ) {
+			int	i;
+
+			for ( i = 0, dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+				i < c->valx; i++ )
+			{
+				if ( *dlip == NULL ) {
+					snprintf( c->cr_msg, sizeof( c->cr_msg ),
+						"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+						"invalid index {%d}\n",
+						c->valx );
+					Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+						c->log, c->cr_msg, 0 );
+					return 1;
+				}
+				dlip = &(*dlip)->dli_next;
+			}
+			dli_next = *dlip;
+
+		} else {
+			for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+				*dlip; dlip = &(*dlip)->dli_next )
+				/* goto last */;
+		}
+
+		*dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
+
+		(*dlip)->dli_oc = oc;
+		(*dlip)->dli_ad = ad;
+		(*dlip)->dli_member_ad = member_ad;
+		(*dlip)->dli_next = dli_next;
+
+		rc = dynlist_build_def_filter( *dlip );
+
+		} break;
+
+	case DL_ATTRPAIR_COMPAT:
+		snprintf( c->cr_msg, sizeof( c->cr_msg ),
+			"warning: \"attrpair\" only supported for limited "
+			"backward compatibility with overlay \"dyngroup\"" );
+		Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
+		/* fallthru */
+
+	case DL_ATTRPAIR: {
+		dynlist_info_t		**dlip;
+		ObjectClass		*oc = NULL;
+		AttributeDescription	*ad = NULL,
+					*member_ad = NULL;
+		const char		*text;
+
+		oc = oc_find( "groupOfURLs" );
+		if ( oc == NULL ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"unable to find default ObjectClass \"groupOfURLs\"" );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		rc = slap_str2ad( c->argv[ 1 ], &member_ad, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"unable to find AttributeDescription \"%s\"",
+				c->argv[ 1 ] );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		rc = slap_str2ad( c->argv[ 2 ], &ad, &text );
+		if ( rc != LDAP_SUCCESS ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+				"unable to find AttributeDescription \"%s\"\n",
+				c->argv[ 2 ] );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		if ( !is_at_subtype( ad->ad_type, slap_schema.si_ad_labeledURI->ad_type ) ) {
+			snprintf( c->cr_msg, sizeof( c->cr_msg ),
+				"\"dynlist-attrset <oc> <URL-ad> [<member-ad>]\": "
+				"AttributeDescription \"%s\" "
+				"must be a subtype of \"labeledURI\"",
+				c->argv[ 2 ] );
+			Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+				c->log, c->cr_msg, 0 );
+			return 1;
+		}
+
+		for ( dlip = (dynlist_info_t **)&on->on_bi.bi_private;
+			*dlip; dlip = &(*dlip)->dli_next )
+		{
+			/* The same URL attribute / member attribute pair
+			 * cannot be repeated */
+			if ( (*dlip)->dli_ad == ad && (*dlip)->dli_member_ad == member_ad ) {
+				snprintf( c->cr_msg, sizeof( c->cr_msg ),
+					"\"dynlist-attrpair <member-ad> <URL-ad>\": "
+					"URL attributeDescription \"%s\" already mapped.\n",
+					ad->ad_cname.bv_val );
+				Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
+					c->log, c->cr_msg, 0 );
+#if 0
+				/* make it a warning... */
+				return 1;
+#endif
+			}
+		}
+
+		*dlip = (dynlist_info_t *)ch_calloc( 1, sizeof( dynlist_info_t ) );
+
+		(*dlip)->dli_oc = oc;
+		(*dlip)->dli_ad = ad;
+		(*dlip)->dli_member_ad = member_ad;
+
+		rc = dynlist_build_def_filter( *dlip );
+
+		} break;
+
+	default:
+		rc = 1;
+		break;
+	}
+
+	return rc;
 }
+#endif
 
 static int
 dynlist_db_open(
-	BackendDB *be
-)
+	BackendDB	*be,
+	ConfigReply	*cr )
 {
-	slap_overinst	*on = (slap_overinst *) be->bd_info;
-	dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
-	ber_len_t	len;
-	char		*ptr;
-
-	if ( dli->dli_oc == NULL ) {
-		fprintf( stderr, "dynlist_db_open(): missing \"dynlist-oc <ObjectClass>\"\n" );
-		return -1;
+	slap_overinst		*on = (slap_overinst *) be->bd_info;
+	dynlist_info_t		*dli = (dynlist_info_t *)on->on_bi.bi_private;
+	ObjectClass		*oc = NULL;
+	AttributeDescription	*ad = NULL;
+	const char	*text;
+	int rc;
+
+	if ( dli == NULL ) {
+		dli = ch_calloc( 1, sizeof( dynlist_info_t ) );
+		on->on_bi.bi_private = (void *)dli;
 	}
 
-	if ( dli->dli_ad == NULL ) {
-		fprintf( stderr, "dynlist_db_open(): missing \"dynlist-ad <AttributeDescription>\"\n" );
-		return -1;
+	for ( ; dli; dli = dli->dli_next ) {
+		if ( dli->dli_oc == NULL ) {
+			if ( oc == NULL ) {
+				oc = oc_find( "groupOfURLs" );
+				if ( oc == NULL ) {
+					snprintf( cr->msg, sizeof( cr->msg),
+						"unable to fetch objectClass \"groupOfURLs\"" );
+					Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s.\n", cr->msg, 0, 0 );
+					return 1;
+				}
+			}
+
+			dli->dli_oc = oc;
+		}
+
+		if ( dli->dli_ad == NULL ) {
+			if ( ad == NULL ) {
+				rc = slap_str2ad( "memberURL", &ad, &text );
+				if ( rc != LDAP_SUCCESS ) {
+					snprintf( cr->msg, sizeof( cr->msg),
+						"unable to fetch attributeDescription \"memberURL\": %d (%s)",
+						rc, text );
+					Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s.\n", cr->msg, 0, 0 );
+					return 1;
+				}
+			}
+		
+			dli->dli_ad = ad;			
+		}
+
+		if ( BER_BVISNULL( &dli->dli_default_filter ) ) {
+			rc = dynlist_build_def_filter( dli );
+			if ( rc != 0 ) {
+				return rc;
+			}
+		}
 	}
 
-	len = STRLENOF( "(!(objectClass=" "))" )
-		+ dli->dli_oc->soc_cname.bv_len;
-	dli->dli_default_filter.bv_val = SLAP_MALLOC( len + 1 );
-	if ( dli->dli_default_filter.bv_val == NULL ) {
-		fprintf( stderr, "dynlist_db_open(): malloc failed\n" );
-		return -1;
+	rc = slap_str2ad( "dgIdentity", &ad_dgIdentity, &text );
+	if ( rc != LDAP_SUCCESS ) {
+		snprintf( cr->msg, sizeof( cr->msg),
+			"unable to fetch attributeDescription \"dgIdentity\": %d (%s)",
+			rc, text );
+		Debug( LDAP_DEBUG_ANY, "dynlist_db_open: %s\n", cr->msg, 0, 0 );
+		/* Just a warning */
 	}
-	ptr = lutil_strcopy( dli->dli_default_filter.bv_val, "(!(objectClass=" );
-	ptr = lutil_strcopy( ptr, dli->dli_oc->soc_cname.bv_val );
-	ptr = lutil_strcopy( ptr, "))" );
-	dli->dli_default_filter.bv_len = ptr - dli->dli_default_filter.bv_val;
 
 	return 0;
 }
 
 static int
 dynlist_db_destroy(
-	BackendDB *be
-)
+	BackendDB	*be,
+	ConfigReply	*cr )
 {
 	slap_overinst	*on = (slap_overinst *) be->bd_info;
-	int		rc = 0;
 
 	if ( on->on_bi.bi_private ) {
-		dynlist_info	*dli = (dynlist_info *)on->on_bi.bi_private;
+		dynlist_info_t	*dli = (dynlist_info_t *)on->on_bi.bi_private,
+				*dli_next;
 
-		dli->dli_oc = NULL;
-		dli->dli_ad = NULL;
+		for ( dli_next = dli; dli_next; dli = dli_next ) {
+			dli_next = dli->dli_next;
 
-		ch_free( dli );
+			ch_free( dli->dli_default_filter.bv_val );
+			ch_free( dli );
+		}
 	}
 
-	return rc;
+	return 0;
 }
 
-static slap_overinst dynlist = { { NULL } };
+static slap_overinst	dynlist = { { NULL } };
+#ifdef TAKEOVER_DYNGROUP
+static char		*obsolete_names[] = {
+	"dyngroup",
+	NULL
+};
+#endif
 
+#if SLAPD_OVER_DYNLIST == SLAPD_MOD_DYNAMIC
+static
+#endif /* SLAPD_OVER_DYNLIST == SLAPD_MOD_DYNAMIC */
 int
-dynlist_init(void)
+dynlist_initialize(void)
 {
+#ifndef OL_2_2_COMPAT
+	int	rc = 0;
+#endif
+
 	dynlist.on_bi.bi_type = "dynlist";
-	dynlist.on_bi.bi_db_init = dynlist_db_init;
+
+#ifdef TAKEOVER_DYNGROUP
+	/* makes dynlist incompatible with dyngroup */
+	dynlist.on_bi.bi_obsolete_names = obsolete_names;
+#endif
+
+#ifdef OL_2_2_COMPAT
 	dynlist.on_bi.bi_db_config = dynlist_db_config;
+#else
+	dynlist.on_bi.bi_db_config = config_generic_wrapper;
+#endif
 	dynlist.on_bi.bi_db_open = dynlist_db_open;
 	dynlist.on_bi.bi_db_destroy = dynlist_db_destroy;
 
 	dynlist.on_response = dynlist_response;
 
+#ifndef OL_2_2_COMPAT
+	dynlist.on_bi.bi_cf_ocs = dlocs;
+
+	rc = config_register_schema( dlcfg, dlocs );
+	if ( rc ) {
+		return rc;
+	}
+#endif
+
 	return overlay_register( &dynlist );
 }
 
@@ -757,7 +1429,7 @@ dynlist_init(void)
 int
 init_module( int argc, char *argv[] )
 {
-	return dynlist_init();
+	return dynlist_initialize();
 }
 #endif