remove dbenv->lock_put() call from transaction-protected operations

[openldap] / servers / slapd / add.c

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index 328f294137473e8e34f488a6ad7493c17be2fd8f..3d308ea8c19a66ab3c9496358a49040d334cc159 100644 (file)
--- a/servers/slapd/add.c
+++ b/servers/slapd/add.c
@@ -109,10 +109,11 @@ do_add( Connection *conn, Operation *op )
            tag = ber_next_element( ber, &len, last ) )
        {
                Modifications *mod;
+               ber_tag_t rtag;
 
-               rc = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
+               rtag = ber_scanf( ber, "{m{W}}", &tmp.sml_type, &tmp.sml_bvalues );
 
-               if ( rc == LBER_ERROR ) {
+               if ( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
                                   "do_add: conn %d      decoding error \n", conn->c_connid ));
@@ -136,7 +137,6 @@ do_add( Connection *conn, Operation *op )
 #endif
                        send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
                                NULL, "no values for attribute type", NULL, NULL );
-                       free( tmp.sml_type.bv_val );
                        goto done;
                }
                mod  = (Modifications *) ch_malloc( sizeof(Modifications) );
@@ -180,7 +180,7 @@ do_add( Connection *conn, Operation *op )
                goto done;
        }
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu ADD dn=\"%s\"\n",
            op->o_connid, op->o_opid, e->e_dn, 0, 0 );
 
        if( e->e_nname.bv_len == 0 ) {