From: Volker Lendecke <vl@samba.org>
Date: Thu, 8 Dec 2011 15:37:40 +0000 (+0100)
Subject: s3-dbwrap: Rewrite dbwrap_fallback_parse_record based on dbwrap_fetch_locked
X-Git-Url: http://git.samba.org/?p=kai%2Fsamba.git;a=commitdiff_plain;h=77dca703504044412872b7e9ad4d2c9c1971ba32

s3-dbwrap: Rewrite dbwrap_fallback_parse_record based on dbwrap_fetch_locked

This is in preparation to remove the db_context->fetch function pointer

Signed-off-by: Michael Adam <obnox@samba.org>
---

diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 8ad6c946e93..0635d76b2cb 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -65,14 +65,23 @@ static NTSTATUS dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key
 							    void *private_data),
 					     void *private_data)
 {
+	struct db_record *rec;
 	TDB_DATA data;
-	NTSTATUS status;
 
-	status = dbwrap_fetch(db, talloc_tos(), key, &data);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+	rec = dbwrap_fetch_locked(db, talloc_tos(), key);
+	if (rec == NULL) {
+		return NT_STATUS_NOT_FOUND;
+	}
+	data = dbwrap_record_get_value(rec);
+
+	data.dptr = talloc_memdup(talloc_tos(), data.dptr, data.dsize);
+	TALLOC_FREE(rec);
+	if (data.dptr == NULL) {
+		return NT_STATUS_NO_MEMORY;
 	}
+
 	parser(key, data, private_data);
+
 	TALLOC_FREE(data.dptr);
 	return NT_STATUS_OK;
 }