From: Volker Lendecke <vl@samba.org>
Date: Wed, 9 Oct 2019 13:13:05 +0000 (+0200)
Subject: vfs: Use dbwrap_parse_record() in vfs_offload_token_db_fetch_fsp()
X-Git-Tag: ldb-2.1.0~636
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbf24bcb1baa588295313e4d37ce84ee6db80168;p=thirdparty%2Fsamba.git

vfs: Use dbwrap_parse_record() in vfs_offload_token_db_fetch_fsp()

Less malloc

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

diff --git a/source3/modules/offload_token.c b/source3/modules/offload_token.c
index 05528da46b5..3e2710ab08a 100644
--- a/source3/modules/offload_token.c
+++ b/source3/modules/offload_token.c
@@ -153,40 +153,50 @@ NTSTATUS vfs_offload_token_db_store_fsp(struct vfs_offload_ctx *ctx,
 	return NT_STATUS_OK;
 }
 
+struct vfs_offload_token_db_fetch_fsp_state {
+	struct files_struct **fsp;
+	NTSTATUS status;
+};
+
+static void vfs_offload_token_db_fetch_fsp_fn(
+	TDB_DATA key, TDB_DATA value, void *private_data)
+{
+	struct vfs_offload_token_db_fetch_fsp_state *state = private_data;
+	void *ptr;
+
+	if (value.dsize != sizeof(ptr)) {
+		DBG_ERR("Bad db entry for token:\n");
+		dump_data(1, key.dptr, key.dsize);
+		state->status = NT_STATUS_INTERNAL_ERROR;
+		return;
+	}
+
+	memcpy(&ptr, value.dptr, value.dsize);
+	*state->fsp = talloc_get_type_abort(ptr, struct files_struct);
+}
+
 NTSTATUS vfs_offload_token_db_fetch_fsp(struct vfs_offload_ctx *ctx,
 					const DATA_BLOB *token_blob,
 					files_struct **fsp)
 {
-	struct db_record *rec = NULL;
+	struct vfs_offload_token_db_fetch_fsp_state state = { .fsp = fsp };
 	TDB_DATA key = make_tdb_data(token_blob->data, token_blob->length);
-	TDB_DATA value;
-	void *ptr = NULL;
+	NTSTATUS status;
 
-	rec = dbwrap_fetch_locked(ctx->db_ctx, talloc_tos(), key);
-	if (rec == NULL) {
-		return NT_STATUS_INTERNAL_ERROR;
+	status = dbwrap_parse_record(
+		ctx->db_ctx,
+		key,
+		vfs_offload_token_db_fetch_fsp_fn,
+		&state);
+	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+		status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
 	}
-
-	value = dbwrap_record_get_value(rec);
-	if (value.dsize == 0) {
+	if (!NT_STATUS_IS_OK(status)) {
 		DBG_DEBUG("Unknown token:\n");
 		dump_data(10, token_blob->data, token_blob->length);
-		TALLOC_FREE(rec);
-		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
-	}
-
-	if (value.dsize != sizeof(ptr)) {
-		DBG_ERR("Bad db entry for token:\n");
-		dump_data(1, token_blob->data, token_blob->length);
-		TALLOC_FREE(rec);
-		return NT_STATUS_INTERNAL_ERROR;
+		return status;
 	}
-
-	memcpy(&ptr, value.dptr, value.dsize);
-	TALLOC_FREE(rec);
-
-	*fsp = talloc_get_type_abort(ptr, struct files_struct);
-	return NT_STATUS_OK;
+	return state.status;
 }
 
 NTSTATUS vfs_offload_token_create_blob(TALLOC_CTX *mem_ctx,