svn commit: samba r3889 - in branches/SAMBA_3_0/source/smbd: .

[jra]

Author: jra
Date: 2004-11-20 02:48:34 +0000 (Sat, 20 Nov 2004)
New Revision: 3889

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3889

Log:
Only set mtime from pending_modtime if it's not already zero...
Jeremy.

Modified:
   branches/SAMBA_3_0/source/smbd/trans2.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/trans2.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/trans2.c     2004-11-20 02:33:12 UTC (rev 
3888)
+++ branches/SAMBA_3_0/source/smbd/trans2.c     2004-11-20 02:48:34 UTC (rev 
3889)
@@ -3304,7 +3304,7 @@
 
        SSVAL(params,0,0);
 
-       if (fsp) {
+       if (fsp && fsp->pending_modtime) {
                /* the pending modtime overrides the current modtime */
                sbuf.st_mtime = fsp->pending_modtime;
        }