Commit 65dd4e6a authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5634

parent 0ad86cb2
......@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
OpenLDAP 2.4.12 Engineering
Fixed liblutil executables on Windows (ITS#5604)
Fixed slapd firstComponentMatch normalization (ITS#5634)
Fixed slapd socket closing on Windows (ITS#5606)
Fixed slapd-ldap,slapd-meta invalid filter behavior (ITS#5614)
Fixed slapd-meta quarantine behavior (ITS#5592)
......
......@@ -4536,8 +4536,10 @@ firstComponentNormalize(
if( val->bv_len < 3 ) return LDAP_INVALID_SYNTAX;
if( val->bv_val[0] != '(' /*')'*/ &&
val->bv_val[0] != '{' /*'}'*/ )
if( ! ( val->bv_val[0] == '(' /*')'*/
&& val->bv_val[val->bv_len - 1] == /*'('*/ ')' )
&& ! ( val->bv_val[0] == '{' /*'}'*/
&& val->bv_val[val->bv_len - 1] == /*'('*/ '}' ) )
{
return LDAP_INVALID_SYNTAX;
}
......@@ -4552,7 +4554,7 @@ firstComponentNormalize(
/* grab next word */
comp.bv_val = &val->bv_val[len];
len = val->bv_len - len;
len = val->bv_len - len - STRLENOF(/*"{"*/ "}");
for( comp.bv_len = 0;
!ASCII_SPACE(comp.bv_val[comp.bv_len]) && comp.bv_len < len;
comp.bv_len++ )
......
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