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>
(cherry picked from commit 46ab1d478d8c27bb4837bf277f8eae5d59613dd2)

diff --git a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
index d4358d2d49fc6fc6e4830f259190cea2b9b82e5d..9bdd494c2f9cdd7781016c1e54d40bc3eaa6b29e 100644 (file)
--- a/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srvsvc/srv_srvsvc_nt.c
@@ -53,6 +53,7 @@ struct file_enum_count {
        TALLOC_CTX *ctx;
        const char *username;
        struct srvsvc_NetFileCtr3 *ctr3;
+       struct file_id *fids;
 };
 
 struct sess_file_info {
@@ -89,6 +90,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;
@@ -120,10 +122,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);