From af69ea73a42a4f3903637ee300a27a4f8db32c73 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 16 Nov 2023 20:39:50 +0100 Subject: [PATCH] smbd: Convert a void* into the real DIR* Not sure why this was a void* Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/smbd/proto.h | 2 +- source3/smbd/vfs.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index adc4be7755a..870e6417b2b 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -1219,7 +1219,7 @@ int vfs_set_blocking(files_struct *fsp, bool set); off_t vfs_transfer_file(files_struct *in, files_struct *out, off_t n); const char *vfs_readdirname(connection_struct *conn, struct files_struct *dirfsp, - void *p, + DIR *d, char **talloced); int vfs_ChDir(connection_struct *conn, const struct smb_filename *smb_fname); diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c index 3a1d18d6676..0b061f1cc31 100644 --- a/source3/smbd/vfs.c +++ b/source3/smbd/vfs.c @@ -846,7 +846,7 @@ off_t vfs_transfer_file(files_struct *in, files_struct *out, off_t n) const char *vfs_readdirname(connection_struct *conn, struct files_struct *dirfsp, - void *p, + DIR *d, char **talloced) { struct dirent *ptr= NULL; @@ -854,10 +854,11 @@ const char *vfs_readdirname(connection_struct *conn, char *translated; NTSTATUS status; - if (!p) + if (d == NULL) { return(NULL); + } - ptr = SMB_VFS_READDIR(conn, dirfsp, (DIR *)p); + ptr = SMB_VFS_READDIR(conn, dirfsp, d); if (!ptr) return(NULL); -- 2.47.3