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

trim extra brackets (ITS#5609); NULL-terminate string

Browse source
This commit is contained in:
Pierangelo Masarati 2008-07-12 16:03:31 +00:00
parent f48d99cb77
commit 18a333bfcf
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/man/man5/slapo-constraint.5
View file

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

11
servers/slapd/overlays/constraint.c
View file

@ -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",