posix_ext: Pass unix file type through posix query_directory

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/selftest/knownfail.d/smb3unix b/selftest/knownfail.d/smb3unix
deleted file mode 100644 (file)
index 59920f2..0000000
--- a/selftest/knownfail.d/smb3unix
+++ /dev/null
@@ -1 +0,0 @@
-samba.tests.smb3unix.samba.tests.smb3unix.Smb3UnixTests.test_posix_perm_files

diff --git a/source3/libsmb/cli_smb2_fnum.c b/source3/libsmb/cli_smb2_fnum.c
index 3324935cbb8390e87080d3f5275a89591fdb20de..e65de62cd52e345ce57a6c2321004733340d29eb 100644 (file)
--- a/source3/libsmb/cli_smb2_fnum.c
+++ b/source3/libsmb/cli_smb2_fnum.c
@@ -1266,7 +1266,7 @@ static NTSTATUS parse_finfo_posix_info(const uint8_t *dir_data,
        finfo->st_ex_dev = info.device;
        finfo->st_ex_nlink = info.cc.nlinks;
        finfo->reparse_tag = info.cc.reparse_tag;
-       finfo->st_ex_mode = wire_perms_to_unix(info.cc.posix_mode);
+       finfo->st_ex_mode = wire_mode_to_unix(info.cc.posix_mode);
        sid_copy(&finfo->owner_sid, &info.cc.owner);
        sid_copy(&finfo->group_sid, &info.cc.group);
 

diff --git a/source3/smbd/smb2_posix.c b/source3/smbd/smb2_posix.c
index c2df0331d4216e615a4165ded359673a03e6c312..72bdac650432279bb76b498458a0fafc0036b2eb 100644 (file)
--- a/source3/smbd/smb2_posix.c
+++ b/source3/smbd/smb2_posix.c
@@ -42,7 +42,7 @@ void smb3_file_posix_information_init(
                .change_time = unix_timespec_to_nt_time(st->st_ex_ctime),
                .cc.nlinks = st->st_ex_nlink,
                .cc.reparse_tag = reparse_tag,
-               .cc.posix_mode = unix_perms_to_wire(st->st_ex_mode & ~S_IFMT),
+               .cc.posix_mode = unix_mode_to_wire(st->st_ex_mode),
                .cc.owner = global_sid_NULL,
                .cc.group = global_sid_NULL,
        };