Commit 212a5374 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#5609

parent 86586b9e
OpenLDAP 2.4 Change Log
OpenLDAP 2.4.12 Engineering
Fixed slapo-constraint string termination (ITS#5609)
OpenLDAP 2.4.11 Release (2008/07/16)
Fixed liblber ber_get_next length decoding (ITS#5580)
......
......@@ -72,8 +72,7 @@ constraint_attribute title uri
A specification like the above would reject any
.B mail
attribute which did not look like
.B
<alpha-numeric string>@mydomain.com
.BR "<alpha-numeric string>@mydomain.com" .
It would also reject any
.B title
attribute whose values were not listed in the
......
......@@ -282,8 +282,16 @@ constraint_cf_gen( ConfigArgs *c )
if (ap.lud->lud_dn == NULL)
ap.lud->lud_dn = ch_strdup("");
if (ap.lud->lud_filter == NULL)
if (ap.lud->lud_filter == NULL) {
ap.lud->lud_filter = ch_strdup("objectClass=*");
} else if ( ap.lud->lud_filter[0] == '(' ) {
ber_len_t len = strlen( ap.lud->lud_filter );
if ( ap.lud->lud_filter[len - 1] != ')' ) {
return( ARG_BAD_CONF );
}
AC_MEMCPY( &ap.lud->lud_filter[0], &ap.lud->lud_filter[1], len - 2 );
ap.lud->lud_filter[len - 2] = '\0';
}
ber_str2bv( c->argv[3], 0, 1, &ap.val );
} else {
......@@ -427,6 +435,7 @@ constraint_violation( constraint *c, struct berval *bv, Operation *op, SlapReply
}
*ptr++ = ')';
*ptr++ = ')';
*ptr++ = '\0';
Debug(LDAP_DEBUG_TRACE,
"==> constraint_violation uri filter = %s\n",
......
Markdown is supported
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