ITS#5173 simplify defer open behavior

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 3cbd561efeed71c5d3ad75adce22da97cc61bbe2..9c6ca2e6eedd06e66cc47378a482eeab49e54188 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -49,7 +49,9 @@ do_add( Operation *op, SlapReply *rs )
        int             rc = 0;
        int             freevals = 1;
 
-       Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "%s do_add\n",
+               op->o_log_prefix, 0, 0 );
+
        /*
         * Parse the add request.  It looks like this:
         *
@@ -64,26 +66,14 @@ do_add( Operation *op, SlapReply *rs )
 
        /* get the name */
        if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_add: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                return SLAPD_DISCONNECT;
        }
 
-       op->ora_e = entry_alloc();
-
-       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
-               op->o_tmpmemctx );
-
-       if ( rs->sr_err != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn.bv_val, 0, 0 );
-               send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
-               goto done;
-       }
-
-       ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
-       ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
-
-       Debug( LDAP_DEBUG_ARGS, "do_add: dn (%s)\n", op->ora_e->e_dn, 0, 0 );
+       Debug( LDAP_DEBUG_ARGS, "%s do_add: dn (%s)\n",
+               op->o_log_prefix, dn.bv_val, 0 );
 
        /* get the attrs */
        for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
@@ -97,15 +87,16 @@ do_add( Operation *op, SlapReply *rs )
                rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_values );
 
                if ( rtag == LBER_ERROR ) {
-                       Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
+                       Debug( LDAP_DEBUG_ANY, "%s do_add: decoding error\n",
+                               op->o_log_prefix, 0, 0 );
                        send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                        rs->sr_err = SLAPD_DISCONNECT;
                        goto done;
                }
 
                if ( tmp.sml_values == NULL ) {
-                       Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
-                               tmp.sml_type.bv_val, 0, 0 );
+                       Debug( LDAP_DEBUG_ANY, "%s do_add: no values for type %s\n",
+                               op->o_log_prefix, tmp.sml_type.bv_val, 0 );
                        send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
                                "no values for attribute type" );
                        goto done;
@@ -125,26 +116,42 @@ do_add( Operation *op, SlapReply *rs )
        }
 
        if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_add: ber_scanf failed\n",
+                       op->o_log_prefix, 0, 0 );
                send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
                rs->sr_err = SLAPD_DISCONNECT;
                goto done;
        }
 
        if ( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
-               Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
+               Debug( LDAP_DEBUG_ANY, "%s do_add: get_ctrls failed\n",
+                       op->o_log_prefix, 0, 0 );
                goto done;
        } 
 
+       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn,
+               op->o_tmpmemctx );
+
+       if ( rs->sr_err != LDAP_SUCCESS ) {
+               Debug( LDAP_DEBUG_ANY, "%s do_add: invalid dn (%s)\n",
+                       op->o_log_prefix, dn.bv_val, 0 );
+               send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
+               goto done;
+       }
+
+       op->ora_e = entry_alloc();
+       ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
+       ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
+
+       Statslog( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
+           op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
+
        if ( modlist == NULL ) {
                send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
                        "no attributes provided" );
                goto done;
        }
 
-       Statslog( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
-           op->o_log_prefix, op->ora_e->e_name.bv_val, 0, 0, 0 );
-
        if ( dn_match( &op->ora_e->e_nname, &slap_empty_bv ) ) {
                /* protocolError may be a more appropriate error */
                send_ldap_error( op, rs, LDAP_ALREADY_EXISTS,
@@ -373,6 +380,7 @@ slap_mods2entry(
        char *textbuf, size_t textlen )
 {
        Attribute **tail;
+       int i;
 
        if ( initial ) {
                assert( (*e)->e_attrs == NULL );
@@ -393,7 +401,7 @@ slap_mods2entry(
                if( attr != NULL ) {
 #define SLURPD_FRIENDLY
 #ifdef SLURPD_FRIENDLY
-                       ber_len_t i,j;
+                       int j;
 
                        if ( !initial ) {
                                /*      
@@ -406,12 +414,9 @@ slap_mods2entry(
                                return LDAP_SUCCESS;
                        }
 
-                       for( i=0; attr->a_vals[i].bv_val; i++ ) {
-                               /* count them */
-                       }
-                       for( j=0; mods->sml_values[j].bv_val; j++ ) {
-                               /* count them */
-                       }
+                       i = attr->a_numvals;
+                       j = mods->sml_numvals;
+                       attr->a_numvals += j;
                        j++;    /* NULL */
                        
                        attr->a_vals = ch_realloc( attr->a_vals,
@@ -459,9 +464,9 @@ slap_mods2entry(
                attr = attr_alloc( mods->sml_desc );
 
                /* move values to attr structure */
+               i = mods->sml_numvals;
+               attr->a_numvals = mods->sml_numvals;
                if ( dup ) { 
-                       int 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++ ) {
                                ber_dupbv( &attr->a_vals[i], &mods->sml_values[i] );
@@ -473,8 +478,7 @@ slap_mods2entry(
 
                if ( mods->sml_nvalues ) {
                        if ( dup ) {
-                               int i;
-                               for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) /* EMPTY */;
+                               i = mods->sml_numvals;
                                attr->a_nvals = (BerVarray) ch_calloc( i+1, sizeof( BerValue ));
                                for ( i = 0; mods->sml_nvalues[i].bv_val; i++ ) {
                                        ber_dupbv( &attr->a_nvals[i], &mods->sml_nvalues[i] );
@@ -486,6 +490,9 @@ slap_mods2entry(
                } else {
                        attr->a_nvals = attr->a_vals;
                }
+               /* slap_mods_check() gives us sorted results */
+               if ( attr->a_desc->ad_type->sat_flags & SLAP_AT_SORTED_VAL )
+                       attr->a_flags |= SLAP_ATTR_SORTED_VALS;
 
                *tail = attr;
                tail = &attr->a_next;
@@ -521,7 +528,8 @@ slap_entry2mods(
 
                mod->sml_type = a_new_desc->ad_cname;
 
-               for ( count = 0; a_new->a_vals[count].bv_val; count++ ) /* EMPTY */;
+               count = a_new->a_numvals;
+               mod->sml_numvals = a_new->a_numvals;
 
                mod->sml_values = (struct berval*) malloc(
                        (count+1) * sizeof( struct berval) );