From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 21 Apr 2005 19:55:22 +0000 (+0000)
Subject: partial fix to ITS#3659; still problems in merging values with "permissive" set
X-Git-Tag: OPENLDAP_AC_BP~847
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a7b1017f44c1536a009b99b88385dd4addbe5d2a;p=openldap

partial fix to ITS#3659; still problems in merging values with "permissive" set
---

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 7f7cc287f5..c417292000 100644
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -211,7 +211,7 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
 
 		/* test access to attribute */
 		for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ )
-			/* jst count */ ;
+			/* just count */ ;
 
 		vals = op->o_tmpalloc( ( i + 1 ) * sizeof( struct berval ), op->o_tmpmemctx );
 		if ( a->a_nvals != a->a_vals ) {
@@ -275,7 +275,7 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
 	Attribute	*a;
 	slap_callback	cb;
 	Operation	o = *op;
-	SlapReply	r = *rs;
+	SlapReply	r = { REP_SEARCH };
 	struct berval	*url;
 	Entry		*e;
 	int		e_flags;