mirror of
https://git.openldap.org/openldap/openldap.git
synced 2026-02-18 18:18:06 -05:00
Fixed slapd substring_comp_candidates null intersection bug (ITS#228)
Fixed slapd modify: delete of last attribute value bug (ITS#229)
This commit is contained in:
parent
6daa87096a
commit
c875e72b11
3 changed files with 18 additions and 0 deletions
2
CHANGES
2
CHANGES
|
|
@ -2,6 +2,8 @@ OpenLDAP Change Log
|
|||
|
||||
Changes included in OpenLDAP 1.2 Release Engineering
|
||||
CVS Tag: OPENLDAP_REL_ENG_1_2
|
||||
Fixed slapd substring_comp_candidates null intersection bug (ITS#228)
|
||||
Fixed slapd modify: delete of last attribute value bug (ITS#229)
|
||||
Build environment
|
||||
Updated Autoconf 2.13 config.guess/config.sub
|
||||
Don't use "ln -s -f file link" (ITS#227)
|
||||
|
|
|
|||
|
|
@ -345,6 +345,11 @@ substring_comp_candidates(
|
|||
idl_free( tmp );
|
||||
idl_free( tmp2 );
|
||||
}
|
||||
|
||||
/* break if no candidates */
|
||||
if( idl == NULL ) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Debug( LDAP_DEBUG_TRACE, "<= substring_comp_candidates %lu\n",
|
||||
|
|
|
|||
|
|
@ -324,6 +324,17 @@ delete_values(
|
|||
a->a_vals[k - 1] = a->a_vals[k];
|
||||
}
|
||||
a->a_vals[k - 1] = NULL;
|
||||
|
||||
/* delete the entire attribute, if no values remain */
|
||||
if ( a->a_vals[0] == NULL) {
|
||||
Debug( LDAP_DEBUG_ARGS,
|
||||
"removing entire attribute %s\n",
|
||||
mod->mod_type, 0, 0 );
|
||||
if ( attr_delete( &e->e_attrs, mod->mod_type ) ) {
|
||||
return LDAP_NO_SUCH_ATTRIBUTE;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue