]> git.sur5r.net Git - openldap/commitdiff
Merge branch 'master' of ssh://git-master.openldap.org/~git/git/openldap
authorGavin Henry <ghenry@OpenLDAP.org>
Wed, 30 Mar 2011 10:52:20 +0000 (11:52 +0100)
committerGavin Henry <ghenry@OpenLDAP.org>
Wed, 30 Mar 2011 10:52:20 +0000 (11:52 +0100)
servers/slapd/slapi/slapi_utils.c

index 77c02c6938e93db1f99f3fa52fb6747e933e609f..66687946c1fa95f66a01119082834e769defa935 100644 (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 );