]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
smbd: Convert a void* into the real DIR*
authorVolker Lendecke <vl@samba.org>
Thu, 16 Nov 2023 19:39:50 +0000 (20:39 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 21 Nov 2023 17:34:36 +0000 (17:34 +0000)
Not sure why this was a void*

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/proto.h
source3/smbd/vfs.c

index adc4be7755a21029ed1c02551a4e30ce12b2c761..870e6417b2b02036ee4fb263593b8d585967907f 100644 (file)
@@ -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);
index 3a1d18d6676e206e4792fdc1c06b13ecd126d749..0b061f1cc31cc8c1397044ce06d20d7448faf691 100644 (file)
@@ -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);