summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-11-20 02:48:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:23 -0500
commit5a83636948cd82c2bf3c5399eed6a9205b6adfac (patch)
tree858fb51049045d2c471565d917e4bdcc5c0ac482 /source3/smbd
parent9b734922b5fb9e0508cc4077074b46701c793e78 (diff)
downloadsamba-5a83636948cd82c2bf3c5399eed6a9205b6adfac.tar.gz
samba-5a83636948cd82c2bf3c5399eed6a9205b6adfac.tar.bz2
samba-5a83636948cd82c2bf3c5399eed6a9205b6adfac.zip
r3889: Only set mtime from pending_modtime if it's not already zero...
Jeremy. (This used to be commit 984c3506351ba97f74813d678424858508c4197a)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/trans2.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index b4140eeafe..633325638a 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -3304,7 +3304,7 @@ static int call_trans2setfilepathinfo(connection_struct *conn, char *inbuf, char
SSVAL(params,0,0);
- if (fsp) {
+ if (fsp && fsp->pending_modtime) {
/* the pending modtime overrides the current modtime */
sbuf.st_mtime = fsp->pending_modtime;
}