summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-10-25 01:56:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:04:37 -0500
commit8af9b5e42e7e1a356e6401079ed5d035f9cc8636 (patch)
treee95f6669feb9e17d37afa359ce02fb54a4ba9e6e /source4/ntvfs/posix
parente90ab07050f2fe8dd1c4399e5deff7eddf66e6d0 (diff)
downloadsamba-8af9b5e42e7e1a356e6401079ed5d035f9cc8636.tar.gz
samba-8af9b5e42e7e1a356e6401079ed5d035f9cc8636.tar.bz2
samba-8af9b5e42e7e1a356e6401079ed5d035f9cc8636.zip
r3179: - fixed error return on utime failure
- formatting fix (This used to be commit 8ca4d7c51e5c76aa28f600d49437a45a8a0d31a9)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/pvfs_setfileinfo.c2
-rw-r--r--source4/ntvfs/posix/pvfs_unlink.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index 42ee8a971c..6a9e2003f4 100644
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -64,7 +64,7 @@ NTSTATUS pvfs_setfileinfo(struct ntvfs_module_context *ntvfs,
/* Set the date on this file */
if (utime(f->name->full_name, &unix_times) == -1) {
- return NT_STATUS_ACCESS_DENIED;
+ return pvfs_map_errno(pvfs, errno);
}
break;
diff --git a/source4/ntvfs/posix/pvfs_unlink.c b/source4/ntvfs/posix/pvfs_unlink.c
index d5e25b5622..5733722ad5 100644
--- a/source4/ntvfs/posix/pvfs_unlink.c
+++ b/source4/ntvfs/posix/pvfs_unlink.c
@@ -100,7 +100,8 @@ NTSTATUS pvfs_unlink(struct ntvfs_module_context *ntvfs,
}
for (i=0;i<dir->count;i++) {
- status = pvfs_unlink_one(pvfs, req, dir->unix_path, dir->names[i], unl->in.attrib);
+ status = pvfs_unlink_one(pvfs, req, dir->unix_path,
+ dir->names[i], unl->in.attrib);
if (NT_STATUS_IS_OK(status)) {
total_deleted++;
}