ITS#2480 uninit'd vars

diff --git a/servers/slapd/back-bdb/delete.c b/servers/slapd/back-bdb/delete.c
index ad44e858ace172b2b8af712d4de99dbb54fbc8e0..6ed4548730403276d9729dca7afe9958a3bb9951 100644 (file)
--- a/servers/slapd/back-bdb/delete.c
+++ b/servers/slapd/back-bdb/delete.c
@@ -126,6 +126,8 @@ retry:      /* transaction retry */
                eip = ei->bei_parent;
                bdb_cache_find_id( op->o_bd, ltid, eip->bei_id, &eip,
                        0, locker, &plock, op->o_tmpmemctx );
+       } else {
+               matched = ei->bei_e;
        }
        if ( eip ) {
                p = eip->bei_e;

diff --git a/servers/slapd/back-bdb/id2entry.c b/servers/slapd/back-bdb/id2entry.c
index 492af33d7cd30016f555e4fa0421f548d60b864d..b758769eb947f9a464468455f0f06811ac7e7376 100644 (file)
--- a/servers/slapd/back-bdb/id2entry.c
+++ b/servers/slapd/back-bdb/id2entry.c
@@ -232,7 +232,7 @@ int bdb_entry_get(
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        struct bdb_op_info *boi = NULL;
        DB_TXN *txn = NULL;
-       Entry *e;
+       Entry *e = NULL;
        EntryInfo *ei;
        int     rc;
        const char *at_name = at->ad_cname.bv_val;

diff --git a/servers/slapd/back-bdb/tools.c b/servers/slapd/back-bdb/tools.c
index b133362557cd4fef47e606c6582aca2d92ced1a8..fc370f8b08fcfa8e3f07267dcd3bb892add27a91 100644 (file)
--- a/servers/slapd/back-bdb/tools.c
+++ b/servers/slapd/back-bdb/tools.c
@@ -107,7 +107,7 @@ ID bdb_tool_entry_next(
 Entry* bdb_tool_entry_get( BackendDB *be, ID id )
 {
        int rc;
-       Entry *e;
+       Entry *e = NULL;
        struct berval bv;
 
        assert( be != NULL );