r2434: separate "attrib" and "ex_attrib" elements for DOS attributes is pointless

(This used to be commit 5fcad57128e47d4d6c0f387d5563d9de2fc08351)

diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index 583455c9ae403327e28c914b4613a7f8b8080ab1..14f8ecfc13cd7ded5738557e4e49e6b9611c82a8 100644 (file)
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -354,7 +354,7 @@ union smb_fileinfo {
                } in;
                
                struct {
-                       uint16_t attrib;
+                       uint32_t attrib;
                        uint32_t ea_size;
                        uint_t num_eas;
                        struct ea_struct {
@@ -366,7 +366,6 @@ union smb_fileinfo {
                        NTTIME access_time;
                        NTTIME write_time;
                        NTTIME change_time;
-                       uint32_t ex_attrib;     
                        uint64_t alloc_size;
                        uint64_t size;
                        uint32_t nlink;

diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 11840c8980169f5d9befe4ce0c4ac2ddf835e4df..34a9c27f34dc2bd2b156bf59df173a82f7e6ee0a 100644 (file)
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -203,7 +203,6 @@ static NTSTATUS svfs_map_fileinfo(struct smbsrv_request *req, union smb_fileinfo
        info->generic.out.num_eas = 0;
        info->generic.out.fname.s = talloc_strdup(req, short_name);
        info->generic.out.alt_fname.s = talloc_strdup(req, short_name);
-       info->generic.out.ex_attrib = 0;
        info->generic.out.compressed_size = 0;
        info->generic.out.format = 0;
        info->generic.out.unit_shift = 0;