From: Volker Lendecke <vl@samba.org>
Date: Wed, 26 Jul 2017 13:12:21 +0000 (+0200)
Subject: dbwrap: Simplify dbwrap_trans_delete
X-Git-Tag: tdb-1.3.15~81
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef2de247c1d0887283cb8dfc25d9e48252a2c9e2;p=thirdparty%2Fsamba.git

dbwrap: Simplify dbwrap_trans_delete

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index acd3c1837bc..cb98d742186 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -376,22 +376,13 @@ NTSTATUS dbwrap_trans_store(struct db_context *db, TDB_DATA key, TDB_DATA dbuf,
 static NTSTATUS dbwrap_delete_action(struct db_context * db, void *private_data)
 {
 	NTSTATUS status;
-	struct db_record *rec;
 	TDB_DATA *key = (TDB_DATA *)private_data;
 
-	rec = dbwrap_fetch_locked(db, talloc_tos(), *key);
-	if (rec == NULL) {
-		DEBUG(5, ("fetch_locked failed\n"));
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	status = dbwrap_record_delete(rec);
+	status = dbwrap_delete(db, *key);
 	if (!NT_STATUS_IS_OK(status)) {
 		DBG_INFO("dbwrap_record_delete returned %s\n",
 			 nt_errstr(status));
 	}
-
-	talloc_free(rec);
 	return  status;
 }