The branch, master has been updated via 7e0b2af s3/smbd: sticky write time offset miscalculation causes broken timestamps from 87f7d32 ctdb-tests: Fix ctdb process-exist tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 7e0b2af4c0c429a3d347ace7b2f75cfeecea6d1f Author: Ralph Boehme <s...@samba.org> Date: Fri Sep 8 12:19:03 2017 +0200 s3/smbd: sticky write time offset miscalculation causes broken timestamps The offset calculation for the offset that got passed to fetch_write_time_send() in the enumeration loop was wrong as it passed the offset before smbd_dirptr_lanman2_entry() added required padding. This resulted in broken timestamps in the find response. Bug: https://bugzilla.samba.org/show_bug.cgi?id=13024 Signed-off-by: Ralph Boehme <s...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Ralph Böhme <s...@samba.org> Autobuild-Date(master): Tue Sep 12 02:45:46 CEST 2017 on sn-devel-144 ----------------------------------------------------------------------- Summary of changes: source3/smbd/smb2_query_directory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c index 3e0abdf..430fdca 100644 --- a/source3/smbd/smb2_query_directory.c +++ b/source3/smbd/smb2_query_directory.c @@ -501,7 +501,6 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx, while (true) { bool got_exact_match = false; int space_remaining = in_output_buffer_length - off; - int cur_off = off; struct file_id file_id; bool stop = false; @@ -556,7 +555,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx, conn, file_id, info_level, - base_data + cur_off, + base_data + last_entry_off, &stop); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); -- Samba Shared Repository