mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
Fix prev commit, filter construction with URI filters
This commit is contained in:
parent
1c87542ea1
commit
bfa0d15834
@ -1139,12 +1139,12 @@ unique_modify(
|
||||
if ( !ks ) continue;
|
||||
|
||||
if ( uri->filter && uri->filter->bv_len )
|
||||
ks += uri->filter->bv_len;
|
||||
key = op->o_tmpalloc(ks, op->o_tmpmemctx);
|
||||
ks += uri->filter->bv_len + STRLENOF ("(&)");
|
||||
kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx);
|
||||
|
||||
if ( uri->filter && uri->filter->bv_len )
|
||||
kp += sprintf ("(&(%s)", uri->filter->bv_val);
|
||||
kp = key + sprintf(key, "(|");
|
||||
kp += sprintf (kp, "(&%s", uri->filter->bv_val);
|
||||
kp += sprintf(kp, "(|");
|
||||
|
||||
for(m = op->orm_modlist; m; m = m->sml_next)
|
||||
if ( (m->sml_op & LDAP_MOD_OP)
|
||||
@ -1256,12 +1256,12 @@ unique_modrdn(
|
||||
if ( !ks ) continue;
|
||||
|
||||
if ( uri->filter && uri->filter->bv_len )
|
||||
ks += uri->filter->bv_len;
|
||||
key = op->o_tmpalloc(ks, op->o_tmpmemctx);
|
||||
ks += uri->filter->bv_len + STRLENOF ("(&)");
|
||||
kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx);
|
||||
|
||||
if ( uri->filter && uri->filter->bv_len )
|
||||
kp += sprintf ("(&(%s)", uri->filter->bv_val);
|
||||
kp = key + sprintf(key, "(|");
|
||||
kp += sprintf (kp, "(&%s", uri->filter->bv_val);
|
||||
kp += sprintf(kp, "(|");
|
||||
|
||||
for ( i=0; newrdn[i]; i++) {
|
||||
bv[0] = newrdn[i]->la_value;
|
||||
|
Loading…
Reference in New Issue
Block a user