summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-06-30 08:16:59 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:09:39 -0500
commitef4475adc4b8da0e3acfe6d70b2afa94a1e500cd (patch)
tree9a3b3b9c97a7e3e689ed1c6604d6433a55fe41da /source4
parentbd0dcebe36ea926e2ad9a32a6eb103a88325c930 (diff)
downloadsamba-ef4475adc4b8da0e3acfe6d70b2afa94a1e500cd.tar.gz
samba-ef4475adc4b8da0e3acfe6d70b2afa94a1e500cd.tar.bz2
samba-ef4475adc4b8da0e3acfe6d70b2afa94a1e500cd.zip
r16706: for RAW_SFILEINFO_SETATTR attrib == 0 means set it to FILE_ATTRIB_NORMAL
and attrib == FILE_ATTRIB_NORMAL means no change... but for RAW_SFILEINFO_BASIC_INFORMATION attrib == 0 means no change metze (This used to be commit e1945feda09a56b6f55bd0f7ab591f3bd069be67)
Diffstat (limited to 'source4')
-rw-r--r--source4/ntvfs/posix/pvfs_setfileinfo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index 2665b9e5f5..6c7c6dc6f7 100644
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -493,7 +493,9 @@ NTSTATUS pvfs_setpathinfo(struct ntvfs_module_context *ntvfs,
if (!null_time(info->setattr.in.write_time)) {
unix_to_nt_time(&newstats.dos.write_time, info->setattr.in.write_time);
}
- if (info->setattr.in.attrib != FILE_ATTRIBUTE_NORMAL) {
+ if (info->setattr.in.attrib == 0) {
+ newstats.dos.attrib = FILE_ATTRIBUTE_NORMAL;
+ } else if (info->setattr.in.attrib != FILE_ATTRIBUTE_NORMAL) {
newstats.dos.attrib = info->setattr.in.attrib;
}
break;