upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 23:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modify replace_values not to merge in new values when no value is

Browse source 
was provided.
This commit is contained in:
Kurt Zeilenga 1999-08-11 19:05:40 +00:00
parent 740f1b422e
commit 49207930cf
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
servers/slapd/back-bdb2/modify.c
View file

@ -314,7 +314,9 @@ bdb2i_replace_values(
{ {
(void) attr_delete( &e->e_attrs, mod->mod_type ); (void) attr_delete( &e->e_attrs, mod->mod_type );
if ( attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 ) { if ( mod->bvalues != NULL &&
attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 )
{
return( LDAP_CONSTRAINT_VIOLATION ); return( LDAP_CONSTRAINT_VIOLATION );
} }

4
servers/slapd/back-ldbm/modify.c
View file

@ -346,7 +346,9 @@ replace_values(
{ {
(void) attr_delete( &e->e_attrs, mod->mod_type ); (void) attr_delete( &e->e_attrs, mod->mod_type );
if ( attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 ) { if ( mod->mod_bvalues != NULL &&
attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 )
{
return( LDAP_CONSTRAINT_VIOLATION ); return( LDAP_CONSTRAINT_VIOLATION );
} }