Skip to content
Snippets Groups Projects
Commit 49207930 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

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

was provided.
parent 740f1b42
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
servers/slapd/back-bdb2/modify.c
+ 3
− 1
View file @ 49207930
......@@ -314,7 +314,9 @@ bdb2i_replace_values(
{
(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 );
}
......
servers/slapd/back-ldbm/modify.c
+ 3
− 1
View file @ 49207930
......@@ -346,7 +346,9 @@ replace_values(
{
(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 );
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment