The Samba-Bugzilla – Attachment 9963 Details for
Bug 3124
xcopy /d with samba shares works not as aspected
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
git-am fix for 3.6.x.
0001-s3-smb2-Move-from-using-SBVAL-to-put-NTTIMEs-on-the-.patch (text/plain), 6.75 KB, created by
Jeremy Allison
on 2014-05-21 19:43:07 UTC
(
hide
)
Description:
git-am fix for 3.6.x.
Filename:
MIME Type:
Creator:
Jeremy Allison
Created:
2014-05-21 19:43:07 UTC
Size:
6.75 KB
patch
obsolete
>From 58a1cb8668409b5846a6f5b4bf4b6277a56d7d6a Mon Sep 17 00:00:00 2001 >From: Jeremy Allison <jra@samba.org> >Date: Wed, 21 May 2014 11:57:16 -0700 >Subject: [PATCH] s3: smb2: Move from using SBVAL to put NTTIMEs on the wire to > put_long_date_timespec. > >put_long_date_timespec() correctly calls round_timespec() >on the time parameters, and is the correct function to >use when writing *any* file-based NTTIME on the wire. > >Move from using NTTIME variables internally >in the server to struct timespec variables, which is >what all the other server code uses. Only map to >NTTIME as the last step of marshalling the output >data. > >The previous SMB2 create code missed the round_timespec() >call before marshalling. > >Bug 3124 - xcopy /d with samba shares works not as aspected > >https://bugzilla.samba.org/show_bug.cgi?id=3124 > >which is a regression from a long-ago bug with >SMB1. > >Signed-off-by: Jeremy Allison <jra@samba.org> >--- > source3/smbd/smb2_create.c | 85 +++++++++++++++++++++++----------------------- > 1 file changed, 43 insertions(+), 42 deletions(-) > >diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c >index 0862990..8a589e8 100644 >--- a/source3/smbd/smb2_create.c >+++ b/source3/smbd/smb2_create.c >@@ -84,10 +84,10 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req, > TALLOC_CTX *mem_ctx, > uint8_t *out_oplock_level, > uint32_t *out_create_action, >- NTTIME *out_creation_time, >- NTTIME *out_last_access_time, >- NTTIME *out_last_write_time, >- NTTIME *out_change_time, >+ struct timespec *out_creation_ts, >+ struct timespec *out_last_access_ts, >+ struct timespec *out_last_write_ts, >+ struct timespec *out_change_ts, > uint64_t *out_allocation_size, > uint64_t *out_end_of_file, > uint32_t *out_file_attributes, >@@ -263,10 +263,11 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq) > DATA_BLOB outdyn; > uint8_t out_oplock_level = 0; > uint32_t out_create_action = 0; >- NTTIME out_creation_time = 0; >- NTTIME out_last_access_time = 0; >- NTTIME out_last_write_time = 0; >- NTTIME out_change_time = 0; >+ connection_struct *conn = smb2req->tcon->compat_conn; >+ struct timespec out_creation_ts = { 0, }; >+ struct timespec out_last_access_ts = { 0, }; >+ struct timespec out_last_write_ts = { 0, }; >+ struct timespec out_change_ts = { 0, }; > uint64_t out_allocation_size = 0; > uint64_t out_end_of_file = 0; > uint32_t out_file_attributes = 0; >@@ -295,10 +296,10 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq) > smb2req, > &out_oplock_level, > &out_create_action, >- &out_creation_time, >- &out_last_access_time, >- &out_last_write_time, >- &out_change_time, >+ &out_creation_ts, >+ &out_last_access_ts, >+ &out_last_write_ts, >+ &out_change_ts, > &out_allocation_size, > &out_end_of_file, > &out_file_attributes, >@@ -349,14 +350,18 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq) > SCVAL(outbody.data, 0x03, 0); /* reserved */ > SIVAL(outbody.data, 0x04, > out_create_action); /* create action */ >- SBVAL(outbody.data, 0x08, >- out_creation_time); /* creation time */ >- SBVAL(outbody.data, 0x10, >- out_last_access_time); /* last access time */ >- SBVAL(outbody.data, 0x18, >- out_last_write_time); /* last write time */ >- SBVAL(outbody.data, 0x20, >- out_change_time); /* change time */ >+ put_long_date_timespec(conn->ts_res, >+ (char *)outbody.data + 0x08, >+ out_creation_ts); /* creation time */ >+ put_long_date_timespec(conn->ts_res, >+ (char *)outbody.data + 0x10, >+ out_last_access_ts); /* last access time */ >+ put_long_date_timespec(conn->ts_res, >+ (char *)outbody.data + 0x18, >+ out_last_write_ts); /* last write time */ >+ put_long_date_timespec(conn->ts_res, >+ (char *)outbody.data + 0x20, >+ out_change_ts); /* change time */ > SBVAL(outbody.data, 0x28, > out_allocation_size); /* allocation size */ > SBVAL(outbody.data, 0x30, >@@ -394,10 +399,10 @@ struct smbd_smb2_create_state { > DATA_BLOB private_data; > uint8_t out_oplock_level; > uint32_t out_create_action; >- NTTIME out_creation_time; >- NTTIME out_last_access_time; >- NTTIME out_last_write_time; >- NTTIME out_change_time; >+ struct timespec out_creation_ts; >+ struct timespec out_last_access_ts; >+ struct timespec out_last_write_ts; >+ struct timespec out_change_ts; > uint64_t out_allocation_size; > uint64_t out_end_of_file; > uint32_t out_file_attributes; >@@ -812,16 +817,12 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx, > update_stat_ex_mtime(&result->fsp_name->st, write_time_ts); > } > >- unix_timespec_to_nt_time(&state->out_creation_time, >- get_create_timespec(smb1req->conn, result, >- result->fsp_name)); >- unix_timespec_to_nt_time(&state->out_last_access_time, >- result->fsp_name->st.st_ex_atime); >- unix_timespec_to_nt_time(&state->out_last_write_time, >- result->fsp_name->st.st_ex_mtime); >- unix_timespec_to_nt_time(&state->out_change_time, >- get_change_timespec(smb1req->conn, result, >- result->fsp_name)); >+ state->out_creation_ts = get_create_timespec(smb1req->conn, >+ result, result->fsp_name); >+ state->out_last_access_ts = result->fsp_name->st.st_ex_atime; >+ state->out_last_write_ts = result->fsp_name->st.st_ex_mtime; >+ state->out_change_ts = get_change_timespec(smb1req->conn, >+ result, result->fsp_name); > state->out_allocation_size = > SMB_VFS_GET_ALLOC_SIZE(smb1req->conn, result, > &(result->fsp_name->st)); >@@ -841,10 +842,10 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req, > TALLOC_CTX *mem_ctx, > uint8_t *out_oplock_level, > uint32_t *out_create_action, >- NTTIME *out_creation_time, >- NTTIME *out_last_access_time, >- NTTIME *out_last_write_time, >- NTTIME *out_change_time, >+ struct timespec *out_creation_ts, >+ struct timespec *out_last_access_ts, >+ struct timespec *out_last_write_ts, >+ struct timespec *out_change_ts, > uint64_t *out_allocation_size, > uint64_t *out_end_of_file, > uint32_t *out_file_attributes, >@@ -863,10 +864,10 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req, > > *out_oplock_level = state->out_oplock_level; > *out_create_action = state->out_create_action; >- *out_creation_time = state->out_creation_time; >- *out_last_access_time = state->out_last_access_time; >- *out_last_write_time = state->out_last_write_time; >- *out_change_time = state->out_change_time; >+ *out_creation_ts = state->out_creation_ts; >+ *out_last_access_ts = state->out_last_access_ts; >+ *out_last_write_ts = state->out_last_write_ts; >+ *out_change_ts = state->out_change_ts; > *out_allocation_size = state->out_allocation_size; > *out_end_of_file = state->out_end_of_file; > *out_file_attributes = state->out_file_attributes; >-- >1.9.1.423.g4596e3a >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=9963">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 3124
:
1554
|
9961
|
9962
| 9963 |
9972
|
9973