upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-01 03:19:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6950 Fix '1.1', '+' and '*' in pcacheAttrSets

Browse source
This commit is contained in:
Ralf Haferkamp 2011-05-24 14:28:07 +02:00
parent 052da7f8a2
commit aa8615b8a2
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servers/slapd/overlays/pcache.c
View file

@ -3767,7 +3767,8 @@ pc_cf_gen( ConfigArgs *c )
attr_name->an_name.bv_val; attr_name++ )
{
bv.bv_len += attr_name->an_name.bv_len + 1;
if ( attr_name->an_desc->ad_flags & SLAP_DESC_TEMPORARY ) {
if ( attr_name->an_desc &&
( attr_name->an_desc->ad_flags & SLAP_DESC_TEMPORARY ) ) {
bv.bv_len += STRLENOF("undef:");
}
}
@ -3777,7 +3778,8 @@ pc_cf_gen( ConfigArgs *c )
for ( attr_name = qm->attr_sets[i].attrs;
attr_name->an_name.bv_val; attr_name++ ) {
*ptr++ = ' ';
if ( attr_name->an_desc->ad_flags & SLAP_DESC_TEMPORARY ) {
if ( attr_name->an_desc &&
( attr_name->an_desc->ad_flags & SLAP_DESC_TEMPORARY ) ) {
ptr = lutil_strcopy( ptr, "undef:" );
}
ptr = lutil_strcopy( ptr, attr_name->an_name.bv_val );
@ -4810,8 +4812,14 @@ pcache_db_close(
for ( i = 0; i < cm->numattrsets; i++ ) {
int j;
/* Account of LDAP_NO_ATTRS */
if ( !qm->attr_sets[i].count ) continue;
for ( j = 0; !BER_BVISNULL( &qm->attr_sets[i].attrs[j].an_name ); j++ ) {
if ( qm->attr_sets[i].attrs[j].an_desc->ad_flags & SLAP_DESC_TEMPORARY ) {
if ( qm->attr_sets[i].attrs[j].an_desc &&
( qm->attr_sets[i].attrs[j].an_desc->ad_flags &
SLAP_DESC_TEMPORARY ) ) {
slap_sl_mfuncs.bmf_free( qm->attr_sets[i].attrs[j].an_desc, NULL );
}
}