Fix aci link error.

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index c0b93363ceb242fb7f03b5660d798174969e0938..e45ded2ae6a9dd06483bc095b39a54bf3c952399 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -156,7 +156,6 @@ do_add( Connection *conn, Operation *op )
 
        /* make sure this backend recongizes critical controls */
        rc = backend_check_controls( be, conn, op, &text ) ;
-
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc,
                        NULL, text, NULL, NULL );
@@ -164,9 +163,7 @@ do_add( Connection *conn, Operation *op )
        }
 
        /* check for referrals */
-       rc = backend_check_referrals( be, conn, op,
-               e->e_dn, e->e_ndn, &text );
-
+       rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn );
        if ( rc != LDAP_SUCCESS ) {
                goto done;
        }
@@ -288,8 +285,34 @@ static int slap_mods2entry(
                attr = attr_find( (*e)->e_attrs, mods->sml_desc );
 
                if( attr != NULL ) {
+#define SLURPD_FRIENDLY
+#ifdef SLURPD_FRIENDLY
+                       ber_len_t i,j;
+
+                       for( i=0; attr->a_vals[i]; i++ ) {
+                               /* count them */
+                       }
+                       for( j=0; mods->sml_bvalues[j]; j++ ) {
+                               /* count them */
+                       }
+                       j++;    /* NULL */
+                       
+                       attr->a_vals = ch_realloc( attr->a_vals,
+                               sizeof( struct berval * ) * (i+j) );
+
+                       /* should check for duplicates */
+                       memcpy( &attr->a_vals[i], mods->sml_bvalues,
+                               sizeof( struct berval * ) * j );
+
+                       /* trim the mods array */
+                       ch_free( mods->sml_bvalues );
+                       mods->sml_bvalues = NULL;
+
+                       continue;
+#else
                        *text = "attribute provided more than once";
-                       return LDAP_OPERATIONS_ERROR;
+                       return LDAP_TYPE_OR_VALUE_EXISTS;
+#endif
                }
 
                attr = ch_calloc( 1, sizeof(Attribute) );