upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-18 21:04:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix unterminated string in previous commit. dnNormalize ought to use an

Browse source 
ldap_bv2dn function instead of ldap_str2dn and honor the bv_len's...
This commit is contained in:
Howard Chu 2001-12-26 04:51:10 +00:00
parent b96645af7d
commit 7685b237b7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
servers/slapd/acl.c
View file

@ -1130,15 +1130,6 @@ acl_check_modlist(
return( 1 );
}
static void
aci_bvdup( struct berval *dest, struct berval *src )
{
dest->bv_val = ch_malloc( src->bv_len + 1);
AC_MEMCPY( dest->bv_val, src->bv_val, src->bv_len );
dest->bv_val[src->bv_len] = 0;
dest->bv_len = src->bv_len;
}
static char *
aci_bvstrdup( struct berval *bv )
{
@ -1276,6 +1267,15 @@ aci_match_set (
/* format of string is "entry/setAttrName" */
if (aci_get_part(subj, 0, '/', &subjdn) < 0) {
return(0);
} else {
/* FIXME: If dnNormalize was based on ldap_bv2dn
* instead of ldap_str2dn and would honor the bv_len
* we could skip this step and not worry about the
* unterminated string.
*/
char *s = ch_malloc(subjdn.bv_len + 1);
AC_MEMCPY(s, subjdn.bv_val, subjdn.bv_len);
subjdn.bv_val = s;
}
if ( aci_get_part(subj, 1, '/', &setat) < 0 ) {
@ -1287,7 +1287,7 @@ aci_match_set (
&& slap_bv2ad(&setat, &desc, &text) == LDAP_SUCCESS )
{
backend_attribute(be, NULL, NULL, e,
&subjdn, desc, &bvals);
ndn, desc, &bvals);
if ( bvals != NULL ) {
if ( bvals[0] != NULL )
set = ch_strdup(bvals[0]->bv_val);