diff options
| author | Ralph Boehme <slow@samba.org> | 2015-12-16 13:13:55 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2015-12-18 10:26:22 +0100 |
| commit | fd925497bc206f67cf30e40bfd0da0e7842bc8eb (patch) | |
| tree | e97135cbeaabcb290200c878a7bbc6153751f2c6 | |
| parent | 6d1ee8b21a17331f391ce095c7dd129a667fe54d (diff) | |
| download | samba-fd925497bc206f67cf30e40bfd0da0e7842bc8eb.tar.gz | |
smbd: make "hide dot files" option work with "store dos attributes = yes"
When using "store dos attributes = yes", the function that reads the
attributes from the xattr get_ea_dos_attribute() will overwrite the
attribute previously set for "hide dot files".
According to smb.conf, "store dos attributes = yes" should only
overwrite the "map XXX" options, but not "hide dot files".
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11645
Signed-off-by: Ralph Boehme <slow@samba.org>
| -rw-r--r-- | source3/smbd/dosmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c index 6fd5d69587a..220c6a1206b 100644 --- a/source3/smbd/dosmode.c +++ b/source3/smbd/dosmode.c @@ -364,7 +364,7 @@ static bool get_ea_dos_attribute(connection_struct *conn, dosattr |= FILE_ATTRIBUTE_DIRECTORY; } /* FILE_ATTRIBUTE_SPARSE is valid on get but not on set. */ - *pattr = (uint32)(dosattr & (SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE)); + *pattr |= (uint32)(dosattr & (SAMBA_ATTRIBUTES_MASK|FILE_ATTRIBUTE_SPARSE)); DEBUG(8,("get_ea_dos_attribute returning (0x%x)", dosattr)); |