diff options
author | Jeremy Allison <jra@samba.org> | 2007-03-12 05:54:14 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:34 -0500 |
commit | 59c071f707c8bd366b807869e88cbf4714185c29 (patch) | |
tree | d8968f0129d052a82f5128ea9de5df9f345c0958 /source3 | |
parent | 77a4b251130b8c187ae89f5d62160ad5cfcb6d14 (diff) | |
download | samba-59c071f707c8bd366b807869e88cbf4714185c29.tar.gz samba-59c071f707c8bd366b807869e88cbf4714185c29.tar.bz2 samba-59c071f707c8bd366b807869e88cbf4714185c29.zip |
r21792: Fix crash bug triggered by Excel reported by Jerry.
Bad cut-n-paste on rewrite of timestamps.
Jeremy.
(This used to be commit 1809e0866ae135af1d5ea36a8534e1678ee9b27d)
Diffstat (limited to 'source3')
-rw-r--r-- | source3/smbd/trans2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 01956d8119..58fa4eb31b 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -3403,7 +3403,7 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd files_struct *fsp1 = file_find_di_first(sbuf.st_dev, sbuf.st_ino); if (fsp1 && !null_timespec(fsp1->pending_modtime)) { /* the pending modtime overrides the current modtime */ - mtime_ts = fsp->pending_modtime; + mtime_ts = fsp1->pending_modtime; } if (fsp1 && fsp1->initial_allocation_size) { allocation_size = get_allocation_size(conn, fsp1, &sbuf); |