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 274c8f40df0d74ddc56db2da53039a630eabf239..2e966d3525e9cffe890aa9fd902166f6c42cd915 100644 (file)
--- a/servers/slapd/back-bdb/add.c
+++ b/servers/slapd/back-bdb/add.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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];
@@ -136,7 +137,7 @@ retry:      /* transaction retry */
                if( p ) {
                        /* free parent and reader lock */
                        if ( p != (Entry *)&slap_entry_root ) {
-                               bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+                               bdb_unlocked_cache_return_entry_r( bdb, p );
                        }
                        p = NULL;
                }
@@ -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;
@@ -218,7 +218,7 @@ retry:      /* transaction retry */
                rs->sr_ref = is_entry_referral( p )
                        ? get_entry_referrals( op, p )
                        : NULL;
-               bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+               bdb_unlocked_cache_return_entry_r( bdb, p );
                p = NULL;
                Debug( LDAP_DEBUG_TRACE,
                        LDAP_XSTRING(bdb_add) ": parent "
@@ -273,7 +273,7 @@ retry:      /* transaction retry */
                        rs->sr_matched = ber_strdup_x( p->e_name.bv_val,
                                op->o_tmpmemctx );
                        rs->sr_ref = get_entry_referrals( op, p );
-                       bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+                       bdb_unlocked_cache_return_entry_r( bdb, p );
                        p = NULL;
                        Debug( LDAP_DEBUG_TRACE,
                                LDAP_XSTRING(bdb_add) ": parent is referral\n",
@@ -284,15 +284,16 @@ 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 */
        if ( p != (Entry *)&slap_entry_root ) {
-               bdb_unlocked_cache_return_entry_r( &bdb->bi_cache, p );
+               bdb_unlocked_cache_return_entry_r( bdb, p );
        }
        p = NULL;
 
@@ -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,13 +467,13 @@ 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
                 * in general callbacks should treat the entry as read-only.
                 */
-               bdb_cache_return_entry_r( bdb->bi_dbenv, &bi->bi_cache, oe, &lock );
+               bdb_cache_return_entry_r( bdb, oe, &lock );
                if ( op->ora_e == oe )
                        op->ora_e = NULL;