diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-20 16:56:16 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-03-20 16:56:16 +0000 |
| commit | 651d5a89c59c107c05e789358624058e16af1b66 (patch) | |
| tree | dfd29754255ea87b30eb16a06c505e42f98b9be3 /source/smbd/fileio.c | |
| parent | 0f475ed1a387e37d477fd434c06ad5783c58adea (diff) | |
| download | samba-651d5a89c59c107c05e789358624058e16af1b66.tar.gz samba-651d5a89c59c107c05e789358624058e16af1b66.tar.xz samba-651d5a89c59c107c05e789358624058e16af1b66.zip | |
r21889: * Pull from SAMBA-3_0_25 svn r21888
* Set version to 3.0.25pre2
Diffstat (limited to 'source/smbd/fileio.c')
| -rw-r--r-- | source/smbd/fileio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/smbd/fileio.c b/source/smbd/fileio.c index e0945be8893..65238c0e9ee 100644 --- a/source/smbd/fileio.c +++ b/source/smbd/fileio.c @@ -149,13 +149,13 @@ static ssize_t real_write_file(files_struct *fsp,const char *data, SMB_OFF_T pos * The 99% solution will hopefully be good enough in this case. JRA. */ - if (fsp->pending_modtime) { + if (!null_timespec(fsp->pending_modtime)) { set_filetime(fsp->conn, fsp->fsp_name, fsp->pending_modtime); /* If we didn't get the "set modtime" call ourselves, we must store the last write time to restore on close. JRA. */ if (!fsp->pending_modtime_owner) { - fsp->last_write_time = time(NULL); + fsp->last_write_time = timespec_current(); } } |