diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-09-20 07:26:01 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:58:52 -0500 |
| commit | 677d1bc487c345b899ed0e7ec2cd00a281051a50 (patch) | |
| tree | 3040861d6ce9fcec9f0b67aea0c44364d1b40c7d | |
| parent | f94de51a4eab98249833b383082467ab001561ce (diff) | |
| download | samba-677d1bc487c345b899ed0e7ec2cd00a281051a50.tar.gz samba-677d1bc487c345b899ed0e7ec2cd00a281051a50.tar.bz2 samba-677d1bc487c345b899ed0e7ec2cd00a281051a50.zip | |
r2434: separate "attrib" and "ex_attrib" elements for DOS attributes is pointless
(This used to be commit 5fcad57128e47d4d6c0f387d5563d9de2fc08351)
| -rw-r--r-- | source4/include/smb_interfaces.h | 3 | ||||
| -rw-r--r-- | source4/ntvfs/simple/vfs_simple.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h index 583455c9ae..14f8ecfc13 100644 --- 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 11840c8980..34a9c27f34 100644 --- 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; |