From e2c9c843e10343ce06141f5d8f58531995b2a571 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 24 Sep 2005 17:09:19 +0000 Subject: [PATCH] fix previous commit; cleanup few 64 bit issues --- servers/slapd/back-meta/search.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c index 1f1408d19c..3dec260d23 100644 --- a/servers/slapd/back-meta/search.c +++ b/servers/slapd/back-meta/search.c @@ -244,8 +244,9 @@ meta_back_search( Operation *op, SlapReply *rs ) LDAPMessage *res = NULL, *e; int rc = 0, sres = LDAP_SUCCESS; char *matched = NULL; - int i, last = 0, ncandidates = 0, + int last = 0, ncandidates = 0, initial_candidates = 0, candidate_match = 0; + long i; dncookie dc; int is_ok = 0; void *savepriv; @@ -726,7 +727,7 @@ really_bad:; * FIXME: only the last one gets caught! */ savepriv = op->o_private; - op->o_private = (void *)mi->mi_ntargets; + op->o_private = (void *)(long)mi->mi_ntargets; if ( candidate_match > 0 ) { struct berval pmatched = BER_BVNULL; @@ -1072,9 +1073,8 @@ meta_send_entry( } } - if ( last == 0 ) { - ch_free( attr->a_vals ); - ch_free( attr ); + if ( last == 0 && attr->a_vals != &slap_dummy_bv ) { + attr_free( attr ); goto next_attr; } } -- 2.39.5