Preliminary ldapAdd support

[openldap] / servers / slapd / back-meta / add.c

diff --git a/servers/slapd/back-meta/add.c b/servers/slapd/back-meta/add.c
index 571b57b75f2ed4cccf7b3c87a1c92871d5cbb390..857ce7ec5f452c6b3a158990fb38faa6a1b978bd 100644 (file)
--- a/servers/slapd/back-meta/add.c
+++ b/servers/slapd/back-meta/add.c
@@ -51,14 +51,12 @@ meta_back_add( Operation *op, SlapReply *rs )
         * get the current connection
         */
        lc = meta_back_getconn( op, rs, META_OP_REQUIRE_SINGLE,
-                       &op->o_req_ndn, &candidate );
-       if ( !lc ) {
-               send_ldap_result( op, rs );
+                       &op->o_req_ndn, &candidate, LDAP_BACK_SENDERR );
+       if ( !lc || !meta_back_dobind( lc, op, LDAP_BACK_SENDERR ) ) {
                return rs->sr_err;
        }
 
-       if ( !meta_back_dobind( lc, op )
-                       || !meta_back_is_valid( lc, candidate ) ) {
+       if ( !meta_back_is_valid( lc, candidate ) ) {
                rs->sr_err = LDAP_UNAVAILABLE;
                send_ldap_result( op, rs );
                return rs->sr_err;
@@ -83,9 +81,10 @@ meta_back_add( Operation *op, SlapReply *rs )
        /* Create array of LDAPMods for ldap_add() */
        attrs = ch_malloc( sizeof( LDAPMod * )*i );
 
+       dc.ctx = "addAttrDN";
        isupdate = be_shadow_update( op );
        for ( i = 0, a = op->ora_e->e_attrs; a; a = a->a_next ) {
-               int     j, is_oc = 0;
+               int                     j, is_oc = 0;
 
                if ( !isupdate && a->a_desc->ad_type->sat_no_user_mod  ) {
                        continue;
@@ -154,21 +153,23 @@ meta_back_add( Operation *op, SlapReply *rs )
                                }
                        }
 
-                       for ( j = 0; a->a_vals[ j ].bv_val; j++ );
-                       attrs[ i ]->mod_vals.modv_bvals = ch_malloc((j+1)*sizeof(struct berval *));
-                       for ( j = 0; a->a_vals[ j ].bv_val; j++ ) {
-                               attrs[ i ]->mod_vals.modv_bvals[ j ] = &a->a_vals[ j ];
+                       for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ )
+                               ;
+                       
+                       attrs[ i ]->mod_bvalues = ch_malloc( ( j + 1 ) * sizeof( struct berval * ) );
+                       for ( j = 0; !BER_BVISNULL( &a->a_vals[ j ] ); j++ ) {
+                               attrs[ i ]->mod_bvalues[ j ] = &a->a_vals[ j ];
                        }
-                       attrs[ i ]->mod_vals.modv_bvals[ j ] = NULL;
+                       attrs[ i ]->mod_bvalues[ j ] = NULL;
                }
                i++;
        }
        attrs[ i ] = NULL;
 
        rs->sr_err = ldap_add_ext_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
-                             attrs, NULL, NULL );
+                             attrs, op->o_ctrls, NULL );
        for ( --i; i >= 0; --i ) {
-               free( attrs[ i ]->mod_vals.modv_bvals );
+               free( attrs[ i ]->mod_bvalues );
                free( attrs[ i ] );
        }
        free( attrs );