summaryrefslogtreecommitdiff
path: root/lib/dbwrap
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2018-08-16 13:18:14 +0200
committerVolker Lendecke <vl@samba.org>2018-09-14 07:49:13 +0200
commitb6b7c157583dae815e57781cbc4f66bd8d71e201 (patch)
tree37bdfce54412fe81f47f24849894f85a305af385 /lib/dbwrap
parent5e4f34e707709ba84be30cd271b10033989b0cbb (diff)
downloadsamba-b6b7c157583dae815e57781cbc4f66bd8d71e201.tar.gz
dbwrap_tdb: Avoid double-call to talloc_get_type_abort
We've already retrieved "ctx" in the callers of db_tdb_fetch_locked_internal(). Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'lib/dbwrap')
-rw-r--r--lib/dbwrap/dbwrap_tdb.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/dbwrap/dbwrap_tdb.c b/lib/dbwrap/dbwrap_tdb.c
index d695f3bd732..00d283c66e6 100644
--- a/lib/dbwrap/dbwrap_tdb.c
+++ b/lib/dbwrap/dbwrap_tdb.c
@@ -111,10 +111,11 @@ static int db_tdb_fetchlock_parse(TDB_DATA key, TDB_DATA data,
}
static struct db_record *db_tdb_fetch_locked_internal(
- struct db_context *db, TALLOC_CTX *mem_ctx, TDB_DATA key)
+ struct db_context *db,
+ struct db_tdb_ctx *ctx,
+ TALLOC_CTX *mem_ctx,
+ TDB_DATA key)
{
- struct db_tdb_ctx *ctx = talloc_get_type_abort(db->private_data,
- struct db_tdb_ctx);
struct tdb_fetch_locked_state state;
int ret;
@@ -162,7 +163,7 @@ static struct db_record *db_tdb_fetch_locked(
DEBUG(3, ("tdb_chainlock failed\n"));
return NULL;
}
- return db_tdb_fetch_locked_internal(db, mem_ctx, key);
+ return db_tdb_fetch_locked_internal(db, ctx, mem_ctx, key);
}
static struct db_record *db_tdb_try_fetch_locked(
@@ -176,7 +177,7 @@ static struct db_record *db_tdb_try_fetch_locked(
DEBUG(3, ("tdb_chainlock_nonblock failed\n"));
return NULL;
}
- return db_tdb_fetch_locked_internal(db, mem_ctx, key);
+ return db_tdb_fetch_locked_internal(db, ctx, mem_ctx, key);
}
static NTSTATUS db_tdb_do_locked(struct db_context *db, TDB_DATA key,