From: Volker Lendecke <vl@samba.org>
Date: Tue, 21 Apr 2020 12:32:16 +0000 (+0200)
Subject: srvsvc: Collect file ids in enum_file_fn()
X-Git-Tag: ldb-2.2.0~504
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46ab1d478d8c27bb4837bf277f8eae5d59613dd2;p=thirdparty%2Fsamba.git

srvsvc: Collect file ids in enum_file_fn()

Will be used a few patches down

Bug: https://bugzilla.samba.org/show_bug.cgi?id=14355

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index 6140e852743..c7bd28509fc 100644
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -54,6 +54,7 @@ struct file_enum_count {
 	TALLOC_CTX *ctx;
 	const char *username;
 	struct srvsvc_NetFileCtr3 *ctr3;
+	struct file_id *fids;
 };
 
 struct sess_file_info {
@@ -90,6 +91,7 @@ static int enum_file_fn(struct file_id id,
 		(struct file_enum_count *)private_data;
 	struct srvsvc_NetFileCtr3 *ctr3 = fenum->ctr3;
 	struct srvsvc_NetFileInfo3 *f;
+	struct file_id *fids = NULL;
 	files_struct fsp;
 	struct byte_range_lock *brl;
 	int num_locks = 0;
@@ -121,10 +123,18 @@ static int enum_file_fn(struct file_id id,
 	}
 	ctr3->array = f;
 
+	fids = talloc_realloc(
+		fenum->ctx, fenum->fids, struct file_id, ctr3->count+1);
+	if (fids == NULL) {
+		DBG_ERR("realloc failed for %"PRIu32" items\n", ctr3->count+1);
+		return 0;
+	}
+	fids[ctr3->count] = id;
+	fenum->fids = fids;
+
 	/* need to count the number of locks on a file */
 
-	ZERO_STRUCT( fsp );
-	fsp.file_id = id;
+	fsp = (struct files_struct) { .file_id = id, };
 
 	if ( (brl = brl_get_locks(talloc_tos(), &fsp)) != NULL ) {
 		num_locks = brl_num_locks(brl);