Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap

This commit is contained in:
Gavin Henry 2011-03-30 11:52:20 +01:00
commit 030cd3923a

View file

@ -2108,12 +2108,7 @@ int slapi_attr_add_value( Slapi_Attr *a, const Slapi_Value *v )
nvalp = NULL;
}
rc = value_add_one( &a->a_vals, (Slapi_Value *)v );
if ( rc == 0 && nvalp != NULL ) {
rc = value_add_one( &a->a_nvals, nvalp );
} else {
a->a_nvals = a->a_vals;
}
rc = attr_valadd( a, (Slapi_Value *)v, nvalp, 1 );
if ( nvalp != NULL ) {
slapi_ch_free_string( &nval.bv_val );