SLAPD_DISCONNECT v -1 cleanup

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index ebb06d69afaa8936c9a5822895a97198b5a87b80..9b4734ed9cdc5c3a61e5ba9698400432ed4a7729 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -36,7 +36,8 @@
 #ifdef LDAP_SLAPI
 #include "slapi/slapi.h"
 
-static void init_add_pblock( Operation *op, struct berval *dn, Entry *e, int manageDSAit );
+static void init_add_pblock( Operation *op, struct berval *dn, Entry *e,
+       int manageDSAit );
 static int call_add_preop_plugins( Operation *op );
 static void call_add_postop_plugins( Operation *op );
 #endif /* LDAP_SLAPI */
@@ -81,12 +82,13 @@ do_add( Operation *op, SlapReply *rs )
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               return SLAPD_DISCONNECT;
        }
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
-       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
+       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+               op->o_tmpmemctx );
 
        if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
@@ -128,7 +130,7 @@ do_add( Operation *op, SlapReply *rs )
                        Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
 #endif
                        send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
-                       rs->sr_err = -1;
+                       rs->sr_err = SLAPD_DISCONNECT;
                        goto done;
                }
 
@@ -166,7 +168,7 @@ do_add( Operation *op, SlapReply *rs )
                Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
 #endif
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
-               rs->sr_err = -1;
+               rs->sr_err = SLAPD_DISCONNECT;
                goto done;
        }
 
@@ -253,8 +255,6 @@ do_add( Operation *op, SlapReply *rs )
                int repl_user = be_isupdate( op );
 #ifndef SLAPD_MULTIMASTER
                if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#else
-               if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ))
 #endif
                {
                        int update = op->o_bd->be_update_ndn.bv_len;
@@ -485,11 +485,12 @@ slap_mods2entry(
 
                        /* check if the values we're adding already exist */
                        if( mr == NULL || !mr->smr_match ) {
-                               for ( i = 0; mods->sml_bvalues[i].bv_val != NULL; i++ ) {
+                               for ( i = 1; mods->sml_values[i].bv_val != NULL; i++ ) {
                                        /* test asserted values against themselves */
                                        for( j = 0; j < i; j++ ) {
-                                               if ( bvmatch( &mods->sml_bvalues[i],
-                                                       &mods->sml_bvalues[j] ) ) {
+                                               if ( bvmatch( &mods->sml_values[i],
+                                                       &mods->sml_values[j] ) )
+                                               {
                                                        /* value exists already */
                                                        snprintf( textbuf, textlen,
                                                                "%s: value #%d provided more than once",
@@ -500,14 +501,15 @@ slap_mods2entry(
                                }
 
                        } else {
-                               int             rc = LDAP_SUCCESS;
+                               int     rc;
                                int match;
 
-                               for ( i = 0; mods->sml_values[i].bv_val != NULL; i++ ) {
+                               for ( i = 1; mods->sml_values[i].bv_val != NULL; i++ ) {
                                        /* test asserted values against themselves */
                                        for( j = 0; j < i; j++ ) {
                                                rc = value_match( &match, mods->sml_desc, mr,
-                                                       SLAP_MR_EQUALITY | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX
+                                                       SLAP_MR_EQUALITY
+                                                       | SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX
                                                        | SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH
                                                        | SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
                                                        mods->sml_nvalues
@@ -517,18 +519,19 @@ slap_mods2entry(
                                                                ? &mods->sml_nvalues[j]
                                                                : &mods->sml_values[j],
                                                        text );
+
                                                if ( rc == LDAP_SUCCESS && match == 0 ) {
                                                        /* value exists already */
                                                        snprintf( textbuf, textlen,
                                                                "%s: value #%d provided more than once",
                                                                mods->sml_desc->ad_cname.bv_val, j );
                                                        return LDAP_TYPE_OR_VALUE_EXISTS;
+
+                                               } else if ( rc != LDAP_SUCCESS ) {
+                                                       return rc;
                                                }
                                        }
                                }
-                               if ( rc != LDAP_SUCCESS ) {
-                                       return rc;
-                               }
                        }
                }
 
@@ -536,17 +539,17 @@ slap_mods2entry(
 
                /* move ad to attr structure */
                attr->a_desc = mods->sml_desc;
-               if ( !dup )
-                       mods->sml_desc = NULL;
+               if ( !dup ) mods->sml_desc = NULL;
 
                /* move values to attr structure */
                /*      should check for duplicates */
                if ( dup ) { 
                        int i;
-                       for ( i = 0; mods->sml_values[i].bv_val; i++ ) ;
+                       for ( i = 0; mods->sml_values[i].bv_val; i++ ) /* EMPTY */;
                        attr->a_vals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
-                       for ( i = 0; mods->sml_values[i].bv_val; i++ )
+                       for ( i = 0; mods->sml_values[i].bv_val; i++ ) {
                                ber_dupbv( &attr->a_vals[i], &mods->sml_values[i] );
+                       }
                        attr->a_vals[i].bv_len = 0;
                        attr->a_vals[i].bv_val = NULL;
                } else {
@@ -557,10 +560,11 @@ slap_mods2entry(
                if ( mods->sml_nvalues ) {
                        if ( dup ) {
                                int i;
-                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) ;
+                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) /* EMPTY */;
                                attr->a_nvals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
-                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ )
+                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) {
                                        ber_dupbv( &attr->a_nvals[i], &mods->sml_nvalues[i] );
+                               }
                                attr->a_nvals[i].bv_len = 0;
                                attr->a_nvals[i].bv_val = NULL;
                        } else {
@@ -602,10 +606,10 @@ slap_entry2mods(
 
                mod->sml_type = a_new_desc->ad_cname;
 
-               for ( count = 0; a_new->a_vals[count].bv_val; count++ );
+               for ( count = 0; a_new->a_vals[count].bv_val; count++ ) /* EMPTY */;
 
-               mod->sml_bvalues = (struct berval*) malloc(
-                               (count+1) * sizeof( struct berval) );
+               mod->sml_values = (struct berval*) malloc(
+                       (count+1) * sizeof( struct berval) );
 
                /* see slap_mods_check() comments...
                 * if a_vals == a_nvals, there is no normalizer.
@@ -619,17 +623,17 @@ slap_entry2mods(
                }
 
                for ( i = 0; i < count; i++ ) {
-                       ber_dupbv(mod->sml_bvalues+i, a_new->a_vals+i); 
+                       ber_dupbv(mod->sml_values+i, a_new->a_vals+i); 
                        if ( mod->sml_nvalues ) {
-                               ber_dupbv( mod->sml_nvalues+i, a_new->a_vals+i ); 
+                               ber_dupbv( mod->sml_nvalues+i, a_new->a_nvals+i ); 
                        } 
                }
 
-               mod->sml_bvalues[count].bv_val = 0; 
-               mod->sml_bvalues[count].bv_len = 0; 
+               mod->sml_values[count].bv_val = NULL; 
+               mod->sml_values[count].bv_len = 0; 
 
                if ( mod->sml_nvalues ) {
-                       mod->sml_nvalues[count].bv_val = 0; 
+                       mod->sml_nvalues[count].bv_val = NULL; 
                        mod->sml_nvalues[count].bv_len = 0; 
                }