From 59c071f707c8bd366b807869e88cbf4714185c29 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 12 Mar 2007 05:54:14 +0000 Subject: 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) --- source3/smbd/trans2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit