don't leave 'round pointers to buffers on the stack

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

diff --git a/servers/slapd/back-bdb/add.c b/servers/slapd/back-bdb/add.c
index aa82328bb5c5525810050c0cc31b1e89be7034a2..2e966d3525e9cffe890aa9fd902166f6c42cd915 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -35,10 +35,11 @@ bdb_add(Operation *op, SlapReply *rs )
        DB_TXN          *ltid = NULL, *lt2;
        struct bdb_op_info opinfo = {0};
        int subentry;
-       u_int32_t       locker = 0, rlocker = 0;
+       BDB_LOCKER      locker = 0, rlocker = 0;
        DB_LOCK         lock;
 
        int             num_retries = 0;
+       int             success;
 
        LDAPControl **postread_ctrl = NULL;
        LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
@@ -173,7 +174,6 @@ retry:      /* transaction retry */
 
        opinfo.boi_bdb = op->o_bd;
        opinfo.boi_txn = ltid;
-       opinfo.boi_locker = locker;
        opinfo.boi_err = 0;
        opinfo.boi_acl_cache = op->o_do_not_cache;
        op->o_private = &opinfo;
@@ -284,10 +284,11 @@ retry:    /* transaction retry */
                        goto return_results;
                }
 
-               if ( subentry ) {
-                       /* FIXME: */
-                       /* parent must be an administrative point of the required kind */
-               }
+       }
+
+       if ( subentry ) {
+               /* FIXME: */
+               /* parent must be an administrative point of the required kind */
        }
 
        /* free parent and reader lock */
@@ -457,6 +458,7 @@ retry:      /* transaction retry */
        if( num_ctrls ) rs->sr_ctrls = ctrls;
 
 return_results:
+       success = rs->sr_err;
        send_ldap_result( op, rs );
        slap_graduate_commit_csn( op );
 
@@ -465,7 +467,7 @@ return_results:
        }
        op->o_private = NULL;
 
-       if( rs->sr_err == LDAP_SUCCESS ) {
+       if( success == LDAP_SUCCESS ) {
                /* We own the entry now, and it can be purged at will
                 * Check to make sure it's the same entry we entered with.
                 * Possibly a callback may have mucked with it, although