From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 14 Jun 2008 12:39:47 +0000 (+0000)
Subject: if there is only one member_ad, and it's not mapped, consider it as old-style member... 
X-Git-Tag: LOCKER_IDS~108
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fa612acf418e36b99760a9234a31232b14268e69;p=openldap

if there is only one member_ad, and it's not mapped, consider it as old-style member listing
---

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 9b2ac459c5..ba9a9d2ac5 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -178,10 +178,10 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 		goto done;
 	}
 
-	for ( dlm = dlc->dlc_dli->dli_dlm; dlm; dlm = dlm->dlm_next ) {
-		if (dlm->dlm_mapped_ad != NULL)
-			continue;
-
+	/* if there is only one member_ad, and it's not mapped,
+	 * consider it as old-style member listing */
+	dlm = dlc->dlc_dli->dli_dlm;
+	if ( dlm && dlm->dlm_mapped_ad == NULL && dlm->dlm_next == NULL ) {
 		/* if access allowed, try to add values, emulating permissive
 		 * control to silently ignore duplicates */
 		if ( access_allowed( op, rs->sr_entry, slap_schema.si_ad_entry,