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

This commit is contained in:
Pierangelo Masarati 2005-04-21 19:55:22 +00:00
parent 8b6d9467ea
commit a7b1017f44

View File

@ -211,7 +211,7 @@ dynlist_sc_update( Operation *op, SlapReply *rs )
/* test access to attribute */ /* test access to attribute */
for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) 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 ); vals = op->o_tmpalloc( ( i + 1 ) * sizeof( struct berval ), op->o_tmpmemctx );
if ( a->a_nvals != a->a_vals ) { if ( a->a_nvals != a->a_vals ) {
@ -275,7 +275,7 @@ dynlist_send_entry( Operation *op, SlapReply *rs )
Attribute *a; Attribute *a;
slap_callback cb; slap_callback cb;
Operation o = *op; Operation o = *op;
SlapReply r = *rs; SlapReply r = { REP_SEARCH };
struct berval *url; struct berval *url;
Entry *e; Entry *e;
int e_flags; int e_flags;