upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-04 14:10:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix previous commit; cleanup few 64 bit issues

Browse source
This commit is contained in:
Pierangelo Masarati 2005-09-24 17:09:19 +00:00
parent bf7194aba9
commit e2c9c843e1
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/back-meta/search.c
View file

@ -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;
}
}