s3/smbd: set FILE_ATTRIBUTE_DIRECTORY as necessary

Some VFS modules like GPFS will always return success from
SMB_VFS_GET_DOS_ATTRIBUTES() but only set a subset of the attributes. It
neither sets FILE_ATTRIBUTE_NORMAL nor FILE_ATTRIBUTE_DIRECTORY.

We already handle the case that the VFS stack returns with result==0 and
then add the FILE_ATTRIBUTE_NORMAL, regardless of the type of the
filesystem object. If we want to handle result==0 situation in the
SMB_VFS_GET_DOS_ATTRIBUTES() caller, then do it right by either setting
FILE_ATTRIBUTE_NORMAL or FILE_ATTRIBUTE_DIRECTORY.

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Sep 16 00:34:43 CEST 2016 on sn-devel-144

(cherry picked from commit 2a2ac63975b8ff41ede8e93ef2b33148c89f185f)

diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 42b869cc31b579bc1bef61cdbb407272fa5baae4..84178feff70a3c3b7b7a59ebeaf57ded169c9e52 100644 (file)
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -625,7 +625,11 @@ uint32_t dos_mode(connection_struct *conn, struct smb_filename *smb_fname)
        result |= dos_mode_from_name(conn, smb_fname, result);
 
        if (result == 0) {
-               result = FILE_ATTRIBUTE_NORMAL;
+               if (S_ISDIR(smb_fname->st.st_ex_mode)) {
+                       result = FILE_ATTRIBUTE_DIRECTORY;
+               } else {
+                       result = FILE_ATTRIBUTE_NORMAL;
+               }
        }
 
        result = filter_mode_by_protocol(result);