summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-11-28 17:03:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:38 -0500
commite5b9a027ff860fd5f34cf91acd14a43f3d6dfbce (patch)
treed282fd64d00aa8461b78f279f5bc19cd66911c03 /source3
parent7b3d349251be63e0c707a82aebb950f67a2df3a9 (diff)
downloadsamba-e5b9a027ff860fd5f34cf91acd14a43f3d6dfbce.tar.gz
samba-e5b9a027ff860fd5f34cf91acd14a43f3d6dfbce.tar.bz2
samba-e5b9a027ff860fd5f34cf91acd14a43f3d6dfbce.zip
r11943: Don't reset attrs to zero in EA get - we are adding
to the attr list not resetting it. Jeremy. (This used to be commit 8ee569626be7ebf3b6ebf71e1becdd091b9e893a)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/dosmode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 5dfeddb80a..7f3bda582d 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -190,7 +190,8 @@ static BOOL get_ea_dos_attribute(connection_struct *conn, const char *path,SMB_S
return False;
}
- *pattr = 0;
+ /* Don't reset pattr to zero as we may already have filename-based attributes we
+ need to preserve. */
sizeret = SMB_VFS_GETXATTR(conn, path, SAMBA_XATTR_DOS_ATTRIB, attrstr, sizeof(attrstr));
if (sizeret == -1) {