Commit 01c15593 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5511

parent d42faf81
...@@ -14,6 +14,7 @@ OpenLDAP 2.4.10 Engineering ...@@ -14,6 +14,7 @@ OpenLDAP 2.4.10 Engineering
Fixed slapo-syncprov op2.o_extra reset (ITS#5501, #5506) Fixed slapo-syncprov op2.o_extra reset (ITS#5501, #5506)
Fixed slapo-syncprov sending ops without queued CSNs (ITS#5465) Fixed slapo-syncprov sending ops without queued CSNs (ITS#5465)
Fixed slapo-unique config structs (ITS#5526) Fixed slapo-unique config structs (ITS#5526)
Fixed slapo-unique filter terminator (ITS#5511)
Documentation Documentation
Add search privileges documentation (ITS#5512) Add search privileges documentation (ITS#5512)
......
...@@ -250,7 +250,6 @@ unique_new_domain_uri ( unique_domain_uri **urip, ...@@ -250,7 +250,6 @@ unique_new_domain_uri ( unique_domain_uri **urip,
filter_free( f ); filter_free( f );
} }
exit: exit:
if ( bv.bv_val ) ber_memfree ( bv.bv_val );
uri->next = *urip; uri->next = *urip;
*urip = uri; *urip = uri;
if ( rc ) { if ( rc ) {
...@@ -1058,6 +1057,9 @@ unique_add( ...@@ -1058,6 +1057,9 @@ unique_add(
/* skip this domain-uri if it isn't involved */ /* skip this domain-uri if it isn't involved */
if ( !ks ) continue; if ( !ks ) continue;
/* terminating NUL */
ks++;
if ( uri->filter.bv_val && uri->filter.bv_len ) if ( uri->filter.bv_val && uri->filter.bv_len )
ks += uri->filter.bv_len + STRLENOF ("(&)"); ks += uri->filter.bv_len + STRLENOF ("(&)");
kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx); kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx);
...@@ -1166,6 +1168,9 @@ unique_modify( ...@@ -1166,6 +1168,9 @@ unique_modify(
/* skip this domain-uri if it isn't involved */ /* skip this domain-uri if it isn't involved */
if ( !ks ) continue; if ( !ks ) continue;
/* terminating NUL */
ks++;
if ( uri->filter.bv_val && uri->filter.bv_len ) if ( uri->filter.bv_val && uri->filter.bv_len )
ks += uri->filter.bv_len + STRLENOF ("(&)"); ks += uri->filter.bv_len + STRLENOF ("(&)");
kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx); kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx);
...@@ -1299,6 +1304,9 @@ unique_modrdn( ...@@ -1299,6 +1304,9 @@ unique_modrdn(
/* skip this domain if it isn't involved */ /* skip this domain if it isn't involved */
if ( !ks ) continue; if ( !ks ) continue;
/* terminating NUL */
ks++;
if ( uri->filter.bv_val && uri->filter.bv_len ) if ( uri->filter.bv_val && uri->filter.bv_len )
ks += uri->filter.bv_len + STRLENOF ("(&)"); ks += uri->filter.bv_len + STRLENOF ("(&)");
kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx); kp = key = op->o_tmpalloc(ks, op->o_tmpmemctx);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment