diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-05-08 22:16:55 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-06-03 14:03:52 +0200 |
| commit | 6e52c4feb80ef68659569ffef8796441df9a7cee (patch) | |
| tree | 5e118d508f99763c49e2af010ce65b51ff9f02c5 /source4/ntvfs/posix | |
| parent | 60759b64a7508b161de795e42c46c2bd62e0728a (diff) | |
| download | samba-6e52c4feb80ef68659569ffef8796441df9a7cee.tar.gz samba-6e52c4feb80ef68659569ffef8796441df9a7cee.tar.bz2 samba-6e52c4feb80ef68659569ffef8796441df9a7cee.zip | |
pvfs_close: correctly handle the write time updates passed by close()
metze
(This used to be commit 7f033ce4fb6fc897f8159926d5a6d2e45dd447b6)
Diffstat (limited to 'source4/ntvfs/posix')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_open.c | 7 | ||||
| -rw-r--r-- | source4/ntvfs/posix/pvfs_resolve.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index c7f93fb0d8..a78d0a79c7 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -1591,7 +1591,6 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs, { struct pvfs_state *pvfs = ntvfs->private_data; struct pvfs_file *f; - struct utimbuf unix_times; if (io->generic.level == RAW_CLOSE_SPLCLOSE) { return NT_STATUS_DOS(ERRSRV, ERRerror); @@ -1607,9 +1606,9 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs, } if (!null_time(io->generic.in.write_time)) { - unix_times.actime = 0; - unix_times.modtime = io->close.in.write_time; - utime(f->handle->name->full_name, &unix_times); + f->handle->write_time.update_forced = false; + f->handle->write_time.update_on_close = true; + unix_to_nt_time(&f->handle->write_time.close_time, io->generic.in.write_time); } if (io->generic.in.flags & SMB2_CLOSE_FLAGS_FULL_INFORMATION) { diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index 969a50239f..0f19788b97 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -712,6 +712,10 @@ NTSTATUS pvfs_resolve_name_handle(struct pvfs_state *pvfs, status = pvfs_resolve_name_fd(pvfs, h->fd, h->name, 0); NT_STATUS_NOT_OK_RETURN(status); + if (!null_nttime(h->write_time.close_time)) { + h->name->dos.write_time = h->write_time.close_time; + } + return NT_STATUS_OK; } |