summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-14 09:16:03 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:47 -0500
commitf0b954968c19722b7f42a4bcd367d5f815efdc47 (patch)
tree5fa48d70fd270c0e54d780cd7eba8d8050769692 /source4/ntvfs/posix
parent270a1a3eb31adbc6b785112e03b41decac6c3aad (diff)
downloadsamba-f0b954968c19722b7f42a4bcd367d5f815efdc47.tar.gz
samba-f0b954968c19722b7f42a4bcd367d5f815efdc47.tar.bz2
samba-f0b954968c19722b7f42a4bcd367d5f815efdc47.zip
r3729: permission changes on directories always include the FILE_ATTRIBUTE_DIRECTORY bit
(This used to be commit 5af815ffc3531e4ae4a6844e9f754656d9acf76e)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/pvfs_setfileinfo.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index e54c37741c..b9ed592bf4 100644
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -471,6 +471,7 @@ NTSTATUS pvfs_setpathinfo(struct ntvfs_module_context *ntvfs,
}
/* possibly change the attribute */
+ newstats.dos.attrib |= (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY);
if (newstats.dos.attrib != name->dos.attrib) {
mode_t mode = pvfs_fileperms(pvfs, newstats.dos.attrib);
if (chmod(name->full_name, mode) == -1) {