--- ../a.diff 2014-08-04 12:20:07.176864984 +0200 +++ ../b.diff 2014-08-04 14:55:53.648513876 +0200 @@ -63,7 +63,7 @@ index 127bbb3..d1074e2 100644 1.9.1 -From 0cf92e59fcacb7401b32c9d01b5ab754ca353017 Mon Sep 17 00:00:00 2001 +From 1b176e2d298042b4c7fbcaf24a2bbfc8ea8b10c0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 12:59:43 +0200 Subject: [PATCH 02/85] TODO/REVIEW s3:smbd: avoid get_peer_addr() and use @@ -73,34 +73,11 @@ There's no need to do syscalls, if we al in userspace. Signed-off-by: Stefan Metzmacher - -On the one hand, there is this hunk: - -- if (write_data(fsp->conn->sconn->sock, buf, cur_read) -- != cur_read) { -- char addr[INET6_ADDRSTRLEN]; -+ ret = write_data(xconn->sconn->sock, buf, cur_read); -+ if (ret != cur_read) { -+ int saved_errno = errno; - -but also - - to_write = MIN(SHORT_SEND_BUFSIZE, smb_maxcnt - nread); -- if (write_data(fsp->conn->sconn->sock, buf, to_write) -+ if (write_data(xconn->sconn->sock, buf, to_write) - != to_write) { - -So in some of the hunks we have the "never do function calls in -expressions", convention pushed through, but not in all of them. Is -there any reason for this? - -Also, in some places I don't see errno is saved around the DEBUG message -where it was not before. DEBUG itself can change the errno. --- source3/smbd/process.c | 17 +++++---- - source3/smbd/reply.c | 93 +++++++++++++++++++++++++++--------------------- - source3/smbd/smb2_read.c | 49 ++++++++++++------------- - 3 files changed, 85 insertions(+), 74 deletions(-) + source3/smbd/reply.c | 97 +++++++++++++++++++++++++++--------------------- + source3/smbd/smb2_read.c | 49 ++++++++++++------------ + 3 files changed, 88 insertions(+), 75 deletions(-) diff --git a/source3/smbd/process.c b/source3/smbd/process.c index d1074e2..1b80ba5 100644 @@ -164,7 +141,7 @@ index d1074e2..1b80ba5 100644 } return True; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index d54326a..1cf6a03 100644 +index d54326a..32ba98f 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3023,6 +3023,7 @@ static void fail_readraw(void) @@ -210,14 +187,18 @@ index d54326a..1cf6a03 100644 #define SHORT_SEND_BUFSIZE 1024 if (nread < headersize) { DEBUG(0,("sendfile_short_send: sendfile failed to send " -@@ -3128,19 +3131,18 @@ void sendfile_short_send(files_struct *fsp, +@@ -3126,21 +3129,21 @@ void sendfile_short_send(files_struct *fsp, + * about efficiency here :-) + */ size_t to_write; ++ ssize_t ret; to_write = MIN(SHORT_SEND_BUFSIZE, smb_maxcnt - nread); - if (write_data(fsp->conn->sconn->sock, buf, to_write) -+ if (write_data(xconn->sconn->sock, buf, to_write) - != to_write) { +- != to_write) { - char addr[INET6_ADDRSTRLEN]; ++ ret = write_data(xconn->sconn->sock, buf, to_write); ++ if (ret != to_write) { + int saved_errno = errno; /* * Try and give an error message saying what @@ -235,7 +216,7 @@ index d54326a..1cf6a03 100644 exit_server_cleanly("sendfile_short_send: " "write_data failed"); } -@@ -3156,21 +3158,23 @@ void sendfile_short_send(files_struct *fsp, +@@ -3156,21 +3159,23 @@ void sendfile_short_send(files_struct *fsp, static void reply_readbraw_error(struct smbd_server_connection *sconn) { @@ -262,7 +243,7 @@ index d54326a..1cf6a03 100644 fail_readraw(); } -@@ -3189,6 +3193,7 @@ static void send_file_readbraw(connection_struct *conn, +@@ -3189,6 +3194,7 @@ static void send_file_readbraw(connection_struct *conn, ssize_t mincount) { struct smbd_server_connection *sconn = req->sconn; @@ -270,7 +251,7 @@ index d54326a..1cf6a03 100644 char *outbuf = NULL; ssize_t ret=0; -@@ -3288,16 +3293,15 @@ normal_readbraw: +@@ -3288,16 +3294,15 @@ normal_readbraw: _smb_setlen(outbuf,ret); if (write_data(sconn->sock, outbuf, 4+ret) != 4+ret) { @@ -292,7 +273,7 @@ index d54326a..1cf6a03 100644 fail_readraw(); } -@@ -3690,6 +3694,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, +@@ -3690,6 +3695,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, files_struct *fsp, off_t startpos, size_t smb_maxcnt) { @@ -300,7 +281,7 @@ index d54326a..1cf6a03 100644 ssize_t nread = -1; struct lock_struct lock; int saved_errno = 0; -@@ -3746,6 +3751,8 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, +@@ -3746,6 +3752,8 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, nread = SMB_VFS_SENDFILE(req->sconn->sock, fsp, &header, startpos, smb_maxcnt); if (nread == -1) { @@ -309,8 +290,11 @@ index d54326a..1cf6a03 100644 /* Returning ENOSYS means no data at all was sent. Do this as a normal read. */ if (errno == ENOSYS) { -@@ -3767,9 +3774,12 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, +@@ -3765,11 +3773,15 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, + nread = fake_sendfile(fsp, startpos, + smb_maxcnt); if (nread == -1) { ++ saved_errno = errno; DEBUG(0,("send_file_readX: " "fake_sendfile failed for " - "file %s (%s).\n", @@ -324,7 +308,7 @@ index d54326a..1cf6a03 100644 exit_server_cleanly("send_file_readX: fake_sendfile failed"); } DEBUG(3, ("send_file_readX: fake_sendfile %s max=%d nread=%d\n", -@@ -3813,35 +3823,37 @@ normal_read: +@@ -3813,35 +3825,37 @@ normal_read: if ((smb_maxcnt & 0xFF0000) > 0x10000) { uint8 headerbuf[smb_size + 2*12]; @@ -377,7 +361,7 @@ index d54326a..1cf6a03 100644 exit_server_cleanly("send_file_readX: fake_sendfile failed"); } goto strict_unlock; -@@ -4103,6 +4115,7 @@ static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout, +@@ -4103,6 +4117,7 @@ static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout, void reply_writebraw(struct smb_request *req) { connection_struct *conn = req->conn; @@ -385,7 +369,7 @@ index d54326a..1cf6a03 100644 char *buf = NULL; ssize_t nwritten=0; ssize_t total_written=0; -@@ -4266,14 +4279,12 @@ void reply_writebraw(struct smb_request *req) +@@ -4266,14 +4281,12 @@ void reply_writebraw(struct smb_request *req) status = read_data(req->sconn->sock, buf+4, numtowrite); if (!NT_STATUS_IS_OK(status)) { @@ -500,7 +484,7 @@ index 603c4a0..f27f1c0 100644 1.9.1 -From 071b628e0e49cfbe511232bc718e655a53ad3985 Mon Sep 17 00:00:00 2001 +From 4b9129f9491060b2349f5cc30261a61b101bacef Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 20 May 2014 19:59:12 +0200 Subject: [PATCH 03/85] s3:smbd: move sconn->nbt.* to xconn->transport.nbt.* @@ -556,7 +540,7 @@ index 1b80ba5..0e468a2 100644 tmp = MAX(tmp, SMB_BUFFER_SIZE_MIN); tmp = MIN(tmp, SMB_BUFFER_SIZE_MAX); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 1cf6a03..be65cee 100644 +index 32ba98f..28c0426 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -533,6 +533,7 @@ static void reply_called_name_not_present(char *outbuf) @@ -589,7 +573,7 @@ index 1cf6a03..be65cee 100644 1.9.1 -From 212f5396629e060c07b7af3afff0fa2e5b3f8550 Mon Sep 17 00:00:00 2001 +From affe93f209497416be791eb4d99131b8a94cb5b5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 May 2014 23:23:34 +0200 Subject: [PATCH 04/85] s3:smbd: move sconn->sock to xconn->transport.sock @@ -602,12 +586,12 @@ Reviewed-by: Volker Lendecke sconn->sock, buf, to_write) -- != to_write) { +- ret = write_data(xconn->sconn->sock, buf, to_write); + ret = write_data(xconn->transport.sock, buf, to_write); -+ if (ret != to_write) { + if (ret != to_write) { int saved_errno = errno; /* - * Try and give an error message saying what -@@ -3165,7 +3167,7 @@ static void reply_readbraw_error(struct smbd_server_connection *sconn) +@@ -3166,7 +3167,7 @@ static void reply_readbraw_error(struct smbd_server_connection *sconn) SIVAL(header,0,0); smbd_lock_socket(sconn); @@ -853,7 +832,7 @@ index be65cee..fb695a2 100644 int saved_errno = errno; /* * Try and give an error message saying what -@@ -3215,7 +3217,7 @@ static void send_file_readbraw(connection_struct *conn, +@@ -3216,7 +3217,7 @@ static void send_file_readbraw(connection_struct *conn, _smb_setlen(header,nread); header_blob = data_blob_const(header, 4); @@ -862,7 +841,7 @@ index be65cee..fb695a2 100644 &header_blob, startpos, nread); if (sendfile_read == -1) { -@@ -3293,7 +3295,7 @@ normal_readbraw: +@@ -3294,7 +3295,7 @@ normal_readbraw: } _smb_setlen(outbuf,ret); @@ -871,7 +850,7 @@ index be65cee..fb695a2 100644 int saved_errno = errno; /* * Try and give an error message saying what -@@ -3749,7 +3751,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, +@@ -3750,7 +3751,7 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, construct_reply_common_req(req, (char *)headerbuf); setup_readX_header(req, (char *)headerbuf, smb_maxcnt); @@ -880,7 +859,7 @@ index be65cee..fb695a2 100644 startpos, smb_maxcnt); if (nread == -1) { saved_errno = errno; -@@ -3830,7 +3832,7 @@ normal_read: +@@ -3832,7 +3833,7 @@ normal_read: setup_readX_header(req, (char *)headerbuf, smb_maxcnt); /* Send out the header. */ @@ -889,7 +868,7 @@ index be65cee..fb695a2 100644 sizeof(headerbuf)); if (ret != sizeof(headerbuf)) { saved_errno = errno; -@@ -4253,7 +4255,7 @@ void reply_writebraw(struct smb_request *req) +@@ -4255,7 +4256,7 @@ void reply_writebraw(struct smb_request *req) } /* Now read the raw data into the buffer and write it */ @@ -898,7 +877,7 @@ index be65cee..fb695a2 100644 &numtowrite); if (!NT_STATUS_IS_OK(status)) { exit_server_cleanly("secondary writebraw failed"); -@@ -4277,7 +4279,7 @@ void reply_writebraw(struct smb_request *req) +@@ -4279,7 +4280,7 @@ void reply_writebraw(struct smb_request *req) (int)tcount,(int)nwritten,(int)numtowrite)); } @@ -907,7 +886,7 @@ index be65cee..fb695a2 100644 if (!NT_STATUS_IS_OK(status)) { /* Try and give an error message -@@ -4340,7 +4342,7 @@ void reply_writebraw(struct smb_request *req) +@@ -4342,7 +4343,7 @@ void reply_writebraw(struct smb_request *req) * sending a NBSSkeepalive. Thanks to DaveCB at Sun for this. * JRA. */ @@ -916,7 +895,7 @@ index be65cee..fb695a2 100644 exit_server_cleanly("reply_writebraw: send of " "keepalive failed"); } -@@ -4708,6 +4710,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn, +@@ -4710,6 +4711,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn, void reply_write_and_X(struct smb_request *req) { connection_struct *conn = req->conn; @@ -924,7 +903,7 @@ index be65cee..fb695a2 100644 files_struct *fsp; struct lock_struct lock; off_t startpos; -@@ -4864,7 +4867,7 @@ void reply_write_and_X(struct smb_request *req) +@@ -4866,7 +4868,7 @@ void reply_write_and_X(struct smb_request *req) out: if (req->unread_bytes) { /* writeX failed. drain socket. */ @@ -1094,7 +1073,7 @@ index 3574049..82e0cdf 100644 1.9.1 -From 13e0673f6fd0916a502e8f636c35f27ac7a7e1b9 Mon Sep 17 00:00:00 2001 +From 5a6ba12f498630fc1d7e1635783db1f57ed840a3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 08:45:01 +0200 Subject: [PATCH 05/85] s3:smbd: move sconn->smb1.fde to xconn->transport.fde @@ -1183,7 +1162,7 @@ index 59af738..20fc92b 100644 1.9.1 -From 2417d98949ab129dc2c03a093ed2b1833429be17 Mon Sep 17 00:00:00 2001 +From a4a6fcaca94746bfe50bb0c371dab0d4563181f2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 09:07:47 +0200 Subject: [PATCH 06/85] s3:smbd: move sconn->status to xconn->transport.status @@ -1336,7 +1315,7 @@ index 20fc92b..bce6034 100644 1.9.1 -From 7b01b1530ec5c9bacdf6b123ccf8893fdcf74cc7 Mon Sep 17 00:00:00 2001 +From 95c62133a8cfe25f0efa6f73ed1a1935da99bd97 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 May 2014 10:27:50 +0200 Subject: [PATCH 07/85] s3:smbd: move sconn->smb1.negprot.* to @@ -1618,7 +1597,7 @@ index 3fc92a0..3c5d025 100644 sconn->smb1.sessions.done_sesssetup = false; sconn->smb1.sessions.max_send = SMB_BUFFER_SIZE_MAX; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index fb695a2..2336893 100644 +index 784f10c..72f4931 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -694,6 +694,7 @@ void reply_tcon(struct smb_request *req) @@ -1717,7 +1696,7 @@ index 1a0cb5e..a908f69 100644 1.9.1 -From 544ceeb67b0709041c464c82c97486e2a490d272 Mon Sep 17 00:00:00 2001 +From 2c1685b0b436f1e6bca4724bf63236171339a92e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 May 2014 10:56:26 +0200 Subject: [PATCH 08/85] s3:smbd: move sconn->smb1.sessions.* to @@ -1818,7 +1797,7 @@ index 3c5d025..c789157 100644 if (!init_dptrs(sconn)) { exit_server("init_dptrs() failed"); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 2336893..4d5c9ea 100644 +index 72f4931..f15e699 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1556,6 +1556,7 @@ void reply_search(struct smb_request *req) @@ -1886,7 +1865,7 @@ index 2336893..4d5c9ea 100644 numtoread = maxtoread; } -@@ -3898,16 +3901,18 @@ nosendfile_read: +@@ -3899,16 +3902,18 @@ nosendfile_read: static size_t calc_max_read_pdu(const struct smb_request *req) { @@ -1908,7 +1887,7 @@ index 2336893..4d5c9ea 100644 } if (req->encrypted) { -@@ -3916,7 +3921,7 @@ static size_t calc_max_read_pdu(const struct smb_request *req) +@@ -3917,7 +3922,7 @@ static size_t calc_max_read_pdu(const struct smb_request *req) * limit. There are padding considerations * that make that tricky. */ @@ -2000,7 +1979,7 @@ index 5304052..76e410f 100644 1.9.1 -From d8e8d529b085182bc223b00a1a9f97d4e73a583d Mon Sep 17 00:00:00 2001 +From 80163828a8f221ba1d28f25c2151a970a4b216f4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 21 May 2014 14:44:01 +0200 Subject: [PATCH 09/85] s3:smbd: move sconn->smb1.signing_state to @@ -2168,7 +2147,7 @@ index eab05c2..efabfad 100644 const DATA_BLOB response); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 4d5c9ea..f7783e6 100644 +index f15e699..d41f4ad 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3212,7 +3212,7 @@ static void send_file_readbraw(connection_struct *conn, @@ -2206,7 +2185,7 @@ index 4d5c9ea..f7783e6 100644 uint8 headerbuf[smb_size + 12 * 2]; DATA_BLOB header; -@@ -3924,7 +3925,7 @@ static size_t calc_max_read_pdu(const struct smb_request *req) +@@ -3925,7 +3926,7 @@ static size_t calc_max_read_pdu(const struct smb_request *req) return xconn->smb1.sessions.max_send; } @@ -2215,7 +2194,7 @@ index 4d5c9ea..f7783e6 100644 return 0x1FFFF; } -@@ -4147,7 +4148,7 @@ void reply_writebraw(struct smb_request *req) +@@ -4148,7 +4149,7 @@ void reply_writebraw(struct smb_request *req) */ SCVAL(discard_const_p(uint8_t, req->inbuf),smb_com,SMBwritec); @@ -2397,7 +2376,7 @@ index 76e410f..d00a6db 100644 1.9.1 -From 2177f04c58c9caf4d7bc673c562ba7d86ee40238 Mon Sep 17 00:00:00 2001 +From 04b2259ccda0a8724810f34a33d8c3403e791d30 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 09:26:26 +0200 Subject: [PATCH 10/85] s3:smbd: move sconn->smb1.echo_handler.* to @@ -2800,7 +2779,7 @@ index 188d619..daf1947 100644 if (!interactive) { smbd_setup_sig_term_handler(sconn); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index f7783e6..6dac6db 100644 +index d41f4ad..9f9683c 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3344,7 +3344,7 @@ void reply_readbraw(struct smb_request *req) @@ -2812,7 +2791,7 @@ index f7783e6..6dac6db 100644 DEBUG(2,("SMBreadbraw rejected with NOT_SUPPORTED because of " "'async smb echo handler = yes'\n")); reply_readbraw_error(sconn); -@@ -4161,7 +4161,7 @@ void reply_writebraw(struct smb_request *req) +@@ -4162,7 +4162,7 @@ void reply_writebraw(struct smb_request *req) return; } @@ -2846,7 +2825,7 @@ index d00a6db..ca0ef73 100644 1.9.1 -From f285a0308784bfcc8d9548bf798c04db1400f9aa Mon Sep 17 00:00:00 2001 +From ebf70a89e40ec8a24456dc3b38cd8fbfed51b43c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 12:57:38 +0200 Subject: [PATCH 11/85] s3:smbd: move sconn->smb1.unix_info.* to @@ -2944,7 +2923,7 @@ index ca0ef73..e6cb64f 100644 1.9.1 -From 0be6f88d9210132ec707d598adb12baa76ec99bf Mon Sep 17 00:00:00 2001 +From 9b240e115fb67de33ca1bc89db463e071427c3a7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:36:14 +0200 Subject: [PATCH 12/85] s3:smbd: move xconn->msg_state to xconn->smb1.msg_state @@ -3099,7 +3078,7 @@ index 0dca2d8..9d8c703 100644 1.9.1 -From f9588759e212095c54430c933f9e4945637bd79f Mon Sep 17 00:00:00 2001 +From ae79d926ab53dcb3a67b0a645956de1b51fcd09b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:32:47 +0200 Subject: [PATCH 13/85] s3:smbd: move libasys state from smbXsrv_connection to @@ -3205,7 +3184,7 @@ index 8399b8e..5a5ed28 100644 1.9.1 -From 47e0a1c96ae0458abffaacde2913612d9d5758c0 Mon Sep 17 00:00:00 2001 +From 550a6157d2ef4a7a67b3e5d64f56a755efc895e9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 09:36:24 +0200 Subject: [PATCH 14/85] s3:smb2_server: use xconn->transport.fde also for smb2 @@ -3329,7 +3308,7 @@ index bce6034..a9db177 100644 1.9.1 -From 7141f579b36b08822eb932637c7fd618a29f7856 Mon Sep 17 00:00:00 2001 +From 509c2efd37d2fd57dfbaceb8246c1e26cee6d1fd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 09:41:57 +0200 Subject: [PATCH 15/85] s3:smb2_server: move sconn->smb2.request_read_state to @@ -3416,7 +3395,7 @@ index a9db177..3b0b10a 100644 1.9.1 -From 83702ef6aed51714fc7cd6faddfe2d77edfb75e6 Mon Sep 17 00:00:00 2001 +From 0ce698f17db5155e1b93bb685643339d4c53595f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 09:53:21 +0200 Subject: [PATCH 16/85] s3:smb2_server: move sconn->smb2.send_queue* to @@ -3596,7 +3575,7 @@ index 3b0b10a..ba00911 100644 1.9.1 -From a19a4b4e33ba28842ff90cc02214d7b2f9f94065 Mon Sep 17 00:00:00 2001 +From 2e77130b5d7415562470e148efe5e8ffa2a650ae Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 10:07:21 +0200 Subject: [PATCH 17/85] s3:smb2_server: move sconn->smb2.negprot_2ff to @@ -3668,7 +3647,7 @@ index deeb19d..c7d88d9 100644 1.9.1 -From 4136c1eb560067f72241dd165c7b543dd00d15be Mon Sep 17 00:00:00 2001 +From 14ee56c2301e5d215a16fd6724a8ff56cdb67d62 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 10:22:34 +0200 Subject: [PATCH 18/85] s3:smb2_server: use xconn->smb2.server.max_* instead of @@ -3880,7 +3859,7 @@ index c61254f..40a5937 100644 1.9.1 -From 9b5b067a2b7f5bcd3129e976b24d400664405c98 Mon Sep 17 00:00:00 2001 +From 59c3fbcfc14f6997242ed31dfbdf3f9b1bb77816 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:36:08 +0200 Subject: [PATCH 19/85] s3:smb2_negprot: remove unused variable 'conn' we @@ -3954,7 +3933,7 @@ index c2e1c71..9d84f1a 100644 1.9.1 -From f96905a4f079f67f7e0c2347dc6fc37338387e00 Mon Sep 17 00:00:00 2001 +From 3d4a86fb2f43eee9ba86ed21876e06756c142986 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 23 May 2014 12:10:23 +0200 Subject: [PATCH 20/85] s3:smb2_server: move sconn->smb2.*credits* to @@ -4368,7 +4347,7 @@ index ba00911..b48d181 100644 1.9.1 -From ccb5c637325de7aa022c5266004367e8922d3966 Mon Sep 17 00:00:00 2001 +From d0f9ff7c35967e552c4185783a3e9c5437db11ae Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 13:24:50 +0200 Subject: [PATCH 21/85] s3:smb2_server: move sconn->smb2.requests to @@ -4601,24 +4580,19 @@ index 93f62fd..6289427 100644 1.9.1 -From 0444ac09a40a0515080914288a50befde4f48267 Mon Sep 17 00:00:00 2001 +From 2ff48804ed55a5f82a5333992be27187934ec31e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 13:34:55 +0200 Subject: [PATCH 22/85] TODO/REVIEW s3:smb2_server: talloc smbd_smb2_request as child of smbXsrv_connection +As the list of pending requests moved from sconn->smb2.requests to xconn->smb2.requests, +it is more logical to use smbXsrv_connection as talloc parent. + This prepares the structures for multi-channel support. -Each request needs to response on the same connection, -where it arrived. Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke - -This gets my R-B for the code, but to me the commit message is a bit -unclear. Directing responses does not directly have to do with the -talloc hierarchy, or do we want to play with talloc_parent() searching -for the smbXsrv_connection? Maybe this is answered in later commits, -but reading this commit message in isolation is a bit misleading. --- source3/smbd/smb2_server.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) @@ -4672,7 +4646,7 @@ index b963b94..16c6fd4 100644 1.9.1 -From 09f98e6abcb5f163d35153a9c442d27b6139699b Mon Sep 17 00:00:00 2001 +From 4d010ad34dcac338663e1aa0a1ee995eed108ef2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 13:34:55 +0200 Subject: [PATCH 23/85] TODO/REVIEW s3:smb2_server: remember smbXsrv_connection @@ -4684,10 +4658,6 @@ where it arrived. Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke - -Ah, here we are. This commit message matches the content more. Can -we focus the last one more on the talloc hierarchy and possible later -tear-down procedures via talloc_free()? Feel free to push when that's in. --- source3/smbd/globals.h | 1 + source3/smbd/smb2_server.c | 6 ++++-- @@ -4750,7 +4720,7 @@ index 16c6fd4..7a0555d 100644 1.9.1 -From 93fe97e68d9803620d2698ea1bb7e8bb8e35ef17 Mon Sep 17 00:00:00 2001 +From e9eb8f2eb8ae7cebf60a659008396ef14c563e1c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 13:34:55 +0200 Subject: [PATCH 24/85] s3:smbd: remember smbXsrv_connection for each @@ -4898,7 +4868,7 @@ index 69ff7bb..1d1fd89 100644 1.9.1 -From 42b283c288c2e05efac1de0c0fa66fccdae3bdef Mon Sep 17 00:00:00 2001 +From 9660d2285c5e380842674cb82cb27156c8894c9d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 15:05:41 +0200 Subject: [PATCH 25/85] s3:smbd: rename 'conn' to 'xconn' in smbd_process() @@ -5017,7 +4987,7 @@ index 63e997d..d249898 100644 1.9.1 -From cad280514cdc1faad0f09d3cdb2078616c45ab1c Mon Sep 17 00:00:00 2001 +From 03ff533e69925da62b0bb65760cfe55a4cb6b773 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 15:05:41 +0200 Subject: [PATCH 26/85] s3:smbd: rename 'conn' to 'xconn' in @@ -5103,7 +5073,7 @@ index 077b81a..c708cb6 100644 1.9.1 -From cd8cdfee3e3e16280a9077dd9130bfebcff1756f Mon Sep 17 00:00:00 2001 +From 47e90d1eae61ef972e8df2667aabe20a80956dbd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 03:06:00 +0200 Subject: [PATCH 27/85] s3:smbd: pass smbXsrv_connection to smbd_register_ips() @@ -5200,7 +5170,7 @@ index d249898..b8baa42 100644 1.9.1 -From 3b1a32884d4c5f5c7386f5d4551a9bf3434f75f7 Mon Sep 17 00:00:00 2001 +From 7b266e464e324de0813d70a06bfef38a8c74dede Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 03:22:53 +0200 Subject: [PATCH 28/85] s3:smbd: use smbXsrv_connection in switch_message() @@ -5268,7 +5238,7 @@ index b8baa42..c015733 100644 1.9.1 -From aec18105a743dc912f35104fdc0ce7dd38e16a32 Mon Sep 17 00:00:00 2001 +From cc013bcbb85196cc320343e82e4a1f7c15f5bbcb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 08:34:05 +0200 Subject: [PATCH 29/85] s3:smbd: let construct_reply() also use @@ -5332,7 +5302,7 @@ index c015733..c1685da 100644 1.9.1 -From 2f12d94834b7f9e36fcf1b033db6e81d521426fc Mon Sep 17 00:00:00 2001 +From 10a716de8c4bd1f1b9aae4203d448989b3715692 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:40:42 +0200 Subject: [PATCH 30/85] s3:smbd: pass smbXsrv_connection to process_smb() @@ -5416,7 +5386,7 @@ index c1685da..e49e357 100644 1.9.1 -From 6c910ea2d4a3e9160f92fccd5b881e676ad15b68 Mon Sep 17 00:00:00 2001 +From 7e48bd9fc063e119ebecab09f316893298751880 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 20:20:58 +0200 Subject: [PATCH 31/85] s3:smbd: pass smbXsrv_connection to fd handlers @@ -5539,7 +5509,7 @@ index e49e357..c8d6079 100644 1.9.1 -From 8fe425371e07812483ed468cbf5383973a28bf50 Mon Sep 17 00:00:00 2001 +From dfcf8d54144b2961375838842f1c5bc2fc6d2a10 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 10 Jun 2014 20:20:58 +0200 Subject: [PATCH 32/85] s3:smb2_server: pass smbXsrv_connection to fd handlers @@ -5613,7 +5583,7 @@ index 7a0555d..7b17fdd 100644 1.9.1 -From e29e5a3a2202e2bdd284c19b8e934ae14e36ca5e Mon Sep 17 00:00:00 2001 +From a01b9d32a914ab8b69b786b89d35ae19df7179fb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 7 Jul 2014 12:25:48 +0200 Subject: [PATCH 33/85] s3:smb2_server: rename 'conn' variables to 'xconn' @@ -5834,7 +5804,7 @@ index 7b17fdd..e0d3ce9 100644 1.9.1 -From d690e2311c6dfe35b864e2a2cccf626d28d58987 Mon Sep 17 00:00:00 2001 +From 7beefd60ad0a184163c29f52f58bd4d39d332d98 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:00:09 +0200 Subject: [PATCH 34/85] s3:smb2_server: pass smbXsrv_connection to @@ -5939,7 +5909,7 @@ index e0d3ce9..8efd980 100644 1.9.1 -From 62705b0f1b31a2f960bd23f70ea46f19366c71d2 Mon Sep 17 00:00:00 2001 +From e38590cead272e2cfbd5a74f173b9f91df955d50 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:03:27 +0200 Subject: [PATCH 35/85] s3:smb2_server: pass smbXsrv_connection to @@ -5980,7 +5950,7 @@ index 8efd980..427f815 100644 1.9.1 -From c0ad99a8cd924ec7f4cc623630045db7662dfc40 Mon Sep 17 00:00:00 2001 +From da56d9eccf11e45832d2024b13dc661a0cc1b179 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:05:43 +0200 Subject: [PATCH 36/85] s3:smb2_server: pass smbXsrv_connection to @@ -6022,7 +5992,7 @@ index 427f815..1f7c3d4 100644 1.9.1 -From 389d84f75be82ffdb1a2d59aa0110f5ebb833ebf Mon Sep 17 00:00:00 2001 +From 1243ef8e94e6e17070b9432e01a8e359b29103bd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:08:26 +0200 Subject: [PATCH 37/85] s3:smb2_server: pass smbXsrv_connection to @@ -6076,7 +6046,7 @@ index 1f7c3d4..eee08f1 100644 1.9.1 -From 7967bb75c7844c652511ab88bb4c15d7994a412d Mon Sep 17 00:00:00 2001 +From c1417d90b05482b03d7f5bb0424d1b458ceafe81 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:42:01 +0200 Subject: [PATCH 38/85] s3:smb2_server: pass smbXsrv_connection to @@ -6150,7 +6120,7 @@ index eee08f1..59cb6d8 100644 1.9.1 -From 73437f71214f5b7ff0c70e16d037f8ac32b2458f Mon Sep 17 00:00:00 2001 +From cf60e0420bf4660e89498c65e53f549057e8457a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:45:56 +0200 Subject: [PATCH 39/85] s3:smb2_server: pass smbXsrv_connection to @@ -6191,7 +6161,7 @@ index 59cb6d8..af2330d 100644 1.9.1 -From b9b26976d91cde282ea53b95f02285e65b8c9366 Mon Sep 17 00:00:00 2001 +From 2f5c2b9cb45d643212f215ac1b651094ad961ace Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:51:04 +0200 Subject: [PATCH 40/85] s3:smb2_server: pass smbXsrv_connection to @@ -6243,7 +6213,7 @@ index af2330d..e0d906f 100644 1.9.1 -From 315ea7f66b7ec6dc30174797e64568f76ad4c2cc Mon Sep 17 00:00:00 2001 +From 09ee90b81aaed333763e141ebc5cea7e618201ee Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 10:59:00 +0200 Subject: [PATCH 41/85] s3:smb2_server: pass smbXsrv_connection to @@ -6319,7 +6289,7 @@ index e0d906f..c7506cb 100644 1.9.1 -From c77f1ed5fafe97ecb1b5d051275fb31c4f8bb949 Mon Sep 17 00:00:00 2001 +From 5360540e8d6d8f24107921c360b6c28db235110e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:19:24 +0200 Subject: [PATCH 42/85] s3:smb2_server: use req->xconn in @@ -6348,7 +6318,7 @@ index c7506cb..a6f0833 100644 1.9.1 -From 400acd661718e46fb912453e76f6ce27880a0be5 Mon Sep 17 00:00:00 2001 +From 5285dc5748c15e8d8511626d20837b8e2373d95b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:22:16 +0200 Subject: [PATCH 43/85] s3:smb2_server: talloc smbd_smb2_request_pending_state @@ -6377,7 +6347,7 @@ index a6f0833..b24d47c 100644 1.9.1 -From 32c1456bfb126f553b7dfae0d4d6fdc5dd8c5b86 Mon Sep 17 00:00:00 2001 +From 91b53247fcb7180185f5001ce5703cf2cbfa8109 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:22:16 +0200 Subject: [PATCH 44/85] s3:smb2_server: remove unused 'sconn' from @@ -6432,7 +6402,7 @@ index b24d47c..b34bea8 100644 1.9.1 -From b587f98b8fb082fc40a9fed25592cbde2357eaed Mon Sep 17 00:00:00 2001 +From 39ddd93db421bae3561c1623e553ea56573a4ed0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:29:01 +0200 Subject: [PATCH 45/85] s3:smb2_server: use req->xconn in @@ -6462,7 +6432,7 @@ index b34bea8..6df8f0e 100644 1.9.1 -From 56b24b9748818af21a9c7b02a7436f16c1a3bbac Mon Sep 17 00:00:00 2001 +From 0efdfd8017c7047a0c894d05b4eb5ee049f593b3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:30:23 +0200 Subject: [PATCH 46/85] s3:smb2_server: use req->xconn in @@ -6502,7 +6472,7 @@ index 6df8f0e..04f1e4e 100644 1.9.1 -From 0b1009bd2f2bace8db9c048589c48d1c340642f4 Mon Sep 17 00:00:00 2001 +From 1470dbede09b5d0baec933264dc3fac7196d1931 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:31:04 +0200 Subject: [PATCH 47/85] s3:smb2_server: use req->xconn in @@ -6531,7 +6501,7 @@ index 04f1e4e..5181623 100644 1.9.1 -From 86c1e33d349a4572749d722b90bd343c4dc234e5 Mon Sep 17 00:00:00 2001 +From 12c26f116778f99a43f4c5aa0bf54dfb6397155d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:31:37 +0200 Subject: [PATCH 48/85] s3:smb2_server: use req->xconn in @@ -6560,7 +6530,7 @@ index 5181623..4b79e14 100644 1.9.1 -From d0c37bc17927b39d23d795699592099499449fe2 Mon Sep 17 00:00:00 2001 +From b25d15818e8851c57f978fd02c802760e5e4df2d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:40:04 +0200 Subject: [PATCH 49/85] s3:smb2_server: use req->xconn in @@ -6589,7 +6559,7 @@ index 4b79e14..9d694ea 100644 1.9.1 -From e4f8f9729ad55655f31ccc72486f47405ea82af0 Mon Sep 17 00:00:00 2001 +From 3bbc50b3bce8c2d49079e64218bb6af6345a103e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:40:36 +0200 Subject: [PATCH 50/85] s3:smb2_server: remove unused 'sconn' from @@ -6625,7 +6595,7 @@ index 9d694ea..e8a783a 100644 1.9.1 -From 1ee83ca65089189af267e00a992799d022d6ec31 Mon Sep 17 00:00:00 2001 +From f9db8f063d9cd8362f336bab836d56365d031303 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 11:41:27 +0200 Subject: [PATCH 51/85] s3:smb2_server: use req->xconn in @@ -6654,7 +6624,7 @@ index e8a783a..3de78b0 100644 1.9.1 -From ca4bda082d59941d69a5a7e31618e333fc9d62ad Mon Sep 17 00:00:00 2001 +From f3c9abdcd1b85f60c95b379b4f6474f03883abc3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:38:48 +0200 Subject: [PATCH 52/85] s3:smb2_*: make use of smb2req->xconn where possible @@ -6885,7 +6855,7 @@ index 40a5937..35ee020 100644 1.9.1 -From 30e554fa91232813453381e54c576482725d6b00 Mon Sep 17 00:00:00 2001 +From 8de5f24d767805bd2547d6f7d2aec71fe1e13f03 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:15:48 +0200 Subject: [PATCH 53/85] s3:smb2_server: pass smbXsrv_connection to @@ -7686,7 +7656,7 @@ index 560fa3c..bd08f6b 100644 1.9.1 -From eda49bf2f5251bb28ab196ffc9c7de1dcd41b443 Mon Sep 17 00:00:00 2001 +From 5afdd79367e311052934cb13b08e8d95d481717b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 24 Jun 2014 19:28:51 +0200 Subject: [PATCH 54/85] s3:smb2_negprot: remove NBT_HDR_SIZE from @@ -7846,7 +7816,7 @@ index 77aa4f1..d9e6a76 100644 1.9.1 -From 8d0c68ca6fdb3b8dca403111b20f15c3261fbbc6 Mon Sep 17 00:00:00 2001 +From 704c2aa5421ad0e1ce8db0ada3f1ddca11441199 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:41:26 +0200 Subject: [PATCH 55/85] s3:smbd: pass smbXsrv_connection to negprot_spnego() @@ -7940,7 +7910,7 @@ index e9d17e2..6524658 100644 1.9.1 -From 0919b8c2c2ad88340a0d3742abef34211e315902 Mon Sep 17 00:00:00 2001 +From 9b69d19264c97642b3479f1bf1f924fc48bfdd9a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:42:56 +0200 Subject: [PATCH 56/85] s3:smbd: pass smbXsrv_connection to get_challenge() @@ -8046,7 +8016,7 @@ index 7db714d..86a4acd 100644 1.9.1 -From b0886fd51a28b5a4ac91497c24449484ad1fc137 Mon Sep 17 00:00:00 2001 +From 10043157c753932a77e43061d9b39514d4275640 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:54:47 +0200 Subject: [PATCH 57/85] s3:smbd: pass smbXsrv_connection to reply_special() @@ -8086,7 +8056,7 @@ index efabfad..74c9950 100644 void reply_tcon_and_X(struct smb_request *req); void reply_unknown_new(struct smb_request *req, uint8 type); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 6dac6db..03e8ec3 100644 +index 9f9683c..e8b1038 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -532,9 +532,9 @@ static void reply_called_name_not_present(char *outbuf) @@ -8114,7 +8084,7 @@ index 6dac6db..03e8ec3 100644 1.9.1 -From 3c5e81345002549c1190079e30c2c9e85a3b1b8f Mon Sep 17 00:00:00 2001 +From 0919e989523443762a96983911b4a617be491087 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:55:24 +0200 Subject: [PATCH 58/85] s3:smbd: pass smbXsrv_connection to @@ -8127,7 +8097,7 @@ Reviewed-by: Volker Lendecke Date: Wed, 11 Jun 2014 13:36:34 +0200 Subject: [PATCH 59/85] s3:smbd: pass smbXsrv_connection to smbd_do_qfsinfo() @@ -8231,7 +8201,7 @@ index e6cb64f..a183794 100644 1.9.1 -From 72711e43881b1b65ffb8fea1403bab2247b7c5b9 Mon Sep 17 00:00:00 2001 +From 42c92c2e5ce3d8c9f51559910883921daef2f741 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 13:54:43 +0200 Subject: [PATCH 60/85] s3:smbd: use req->xconn in vfs_[p]write_data() @@ -8268,7 +8238,7 @@ index 82e0cdf..c219b1f 100644 1.9.1 -From 8dfdd3a340d4df73b255d04f380744aee22f75c8 Mon Sep 17 00:00:00 2001 +From 937a5f74b96aef3633fec68445b1b3871c83c10e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 13:57:30 +0200 Subject: [PATCH 61/85] s3:smbd: remove unused 'sconn' in @@ -8298,7 +8268,7 @@ index a183794..77ba9aa 100644 1.9.1 -From ecb7a87b97c80da0d8fead0586233c48da8d70a9 Mon Sep 17 00:00:00 2001 +From 2d22a8fdd9ef29bb696be0f4fc2a4b6ff8536b4a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:22:13 +0200 Subject: [PATCH 62/85] s3:smbd: use req->xconn to send_trans2_replies() @@ -8328,7 +8298,7 @@ index 77ba9aa..9a02a74 100644 1.9.1 -From bfa73879d61d6eb5cd729f0696a812643a94f90e Mon Sep 17 00:00:00 2001 +From d482507067f53e37f53c80c89faa84e23c87647e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:25:07 +0200 Subject: [PATCH 63/85] s3:smbd: use req->xconn in files.c @@ -8385,7 +8355,7 @@ index 2a0f6ce..a9e8357 100644 1.9.1 -From 440f2ac58572a8f63b28d409599471a21faf5c1a Mon Sep 17 00:00:00 2001 +From c1250387b96278381a526400ea9db341fc1b97bf Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:26:08 +0200 Subject: [PATCH 64/85] s3:smbd: use req->xconn in send_trans_reply() @@ -8415,7 +8385,7 @@ index 1c8033d..9a07ba0 100644 1.9.1 -From 83e84b36c597b6cda8d49bbe393b52bef74c2a2e Mon Sep 17 00:00:00 2001 +From b45f20585307fce0c0ffd35ddb4f01e4d2282418 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:26:57 +0200 Subject: [PATCH 65/85] s3:smbd: use req->xconn in nttrans.c @@ -8466,7 +8436,7 @@ index 57c4159..2521a1e 100644 1.9.1 -From 80113e8e409001c35282070cdd5fa8de7b3f8c1f Mon Sep 17 00:00:00 2001 +From 607eb4a60a2491d75e0bde5af64ca1d057c00c8e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:28:13 +0200 Subject: [PATCH 66/85] s3:smbd: remove unused 'sconn' from @@ -8518,10 +8488,10 @@ index 74c9950..3dea578 100644 NTSTATUS srv_decrypt_buffer(struct smbd_server_connection *sconn, char *buf); NTSTATUS srv_encrypt_buffer(struct smbd_server_connection *sconn, char *buf, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 5d72917..6b0acb6 100644 +index 9722307..22e06f2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c -@@ -4627,7 +4627,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn, +@@ -4628,7 +4628,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn, struct files_struct *fsp = NULL; NTSTATUS status; @@ -8548,7 +8518,7 @@ index 273013b..7ab992e 100644 1.9.1 -From 9de076270292a9f71f627863dccf98a1a8e86c5b Mon Sep 17 00:00:00 2001 +From 2420b7f067c510edf2a5214045bf8c994e925fcb Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:29:52 +0200 Subject: [PATCH 67/85] s3:smbd: remove unused 'sconn' from valid_smb_header() @@ -8604,7 +8574,7 @@ index 8caa7d2..8a57b53 100644 1.9.1 -From 34bf16888a06a9359399993b18ce9899d710742e Mon Sep 17 00:00:00 2001 +From f3845e5167d4e91d02e6a6eac9b75832ddb7abfe Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:35:55 +0200 Subject: [PATCH 68/85] s3:smbd: pass smbXsrv_connection to @@ -8653,10 +8623,10 @@ index 3dea578..a44d1bd 100644 void reply_write_and_X(struct smb_request *req); void reply_lseek(struct smb_request *req); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 6b0acb6..516145a 100644 +index 22e06f2..5371537 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c -@@ -4616,7 +4616,7 @@ strict_unlock: +@@ -4617,7 +4617,7 @@ strict_unlock: (2*14) + /* word count (including bcc) */ \ 1 /* pad byte */) @@ -8665,7 +8635,7 @@ index 6b0acb6..516145a 100644 const uint8_t *inbuf) { size_t numtowrite; -@@ -4645,7 +4645,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn, +@@ -4646,7 +4646,7 @@ bool is_valid_writeX_buffer(struct smbd_server_connection *sconn, } fnum = SVAL(inbuf, smb_vwv2); @@ -8678,7 +8648,7 @@ index 6b0acb6..516145a 100644 1.9.1 -From 60101bfc48f554ca313c47ada14d3c6a098ad880 Mon Sep 17 00:00:00 2001 +From 006425a73c8d2c00e4c5e7a24aef11bdb86d6f54 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 14:51:05 +0200 Subject: [PATCH 69/85] s3:smbd: pass smbXsrv_connection to @@ -8691,7 +8661,7 @@ Reviewed-by: Volker Lendecke Date: Wed, 11 Jun 2014 15:11:05 +0200 Subject: [PATCH 70/85] s3:smbd: use req->xconn in sesssetup.c @@ -8870,7 +8840,7 @@ index 43be24a..b5e8d87 100644 1.9.1 -From a1fea8a8736b20eb154bbe4cc70a1614b0481bea Mon Sep 17 00:00:00 2001 +From 5d640a114766cd759fa332bf1b9ad713bebacb58 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 15:12:32 +0200 Subject: [PATCH 71/85] s3:smbd: use req->xconn in reply.c @@ -8882,7 +8852,7 @@ Reviewed-by: Volker Lendecke smb1.sessions.max_send; } -@@ -3946,6 +3944,7 @@ static size_t calc_read_size(const struct smb_request *req, +@@ -3947,6 +3945,7 @@ static size_t calc_read_size(const struct smb_request *req, size_t upper_size, size_t lower_size) { @@ -8976,7 +8946,7 @@ index a46431d..d3b6765 100644 size_t max_pdu = calc_max_read_pdu(req); size_t total_size = 0; size_t hdr_len = MIN_SMB_SIZE + VWV(12); -@@ -3961,7 +3960,7 @@ static size_t calc_read_size(const struct smb_request *req, +@@ -3962,7 +3961,7 @@ static size_t calc_read_size(const struct smb_request *req, upper_size = 0; } @@ -8985,7 +8955,7 @@ index a46431d..d3b6765 100644 upper_size = 0; } -@@ -4124,7 +4123,7 @@ static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout, +@@ -4125,7 +4124,7 @@ static NTSTATUS read_smb_length(int fd, char *inbuf, unsigned int timeout, void reply_writebraw(struct smb_request *req) { connection_struct *conn = req->conn; @@ -8994,7 +8964,7 @@ index a46431d..d3b6765 100644 char *buf = NULL; ssize_t nwritten=0; ssize_t total_written=0; -@@ -4716,7 +4715,7 @@ bool is_valid_writeX_buffer(struct smbXsrv_connection *xconn, +@@ -4717,7 +4716,7 @@ bool is_valid_writeX_buffer(struct smbXsrv_connection *xconn, void reply_write_and_X(struct smb_request *req) { connection_struct *conn = req->conn; @@ -9007,7 +8977,7 @@ index a46431d..d3b6765 100644 1.9.1 -From fc7df8144a41e3dc4f663a1c90fcd63787d80688 Mon Sep 17 00:00:00 2001 +From bf3a7d28ccd20eb7921ffa3a662c9bd46d1b1cac Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Jun 2014 12:36:14 +0200 Subject: [PATCH 72/85] s3:smbd: use req->xconn in message.c @@ -9054,7 +9024,7 @@ index 9d8c703..a1ead4a 100644 1.9.1 -From 28407b52f7baafe408084fe0e5b54bc15175f45f Mon Sep 17 00:00:00 2001 +From 48f8669a0c007223a99394967d65adcda4a20254 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:51:44 +0200 Subject: [PATCH 73/85] s3:smbd: use req->xconn in smb_request_done() @@ -9082,7 +9052,7 @@ index 66cb95f..77ecdb9 100644 1.9.1 -From 0174586d1232a204a44137978fd1b8c480c755e6 Mon Sep 17 00:00:00 2001 +From 1c1ec208bbb3a0f604907fdf79cf9321ebbcaa2b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:48:16 +0200 Subject: [PATCH 74/85] s3:smbd: pass smbXsrv_connection to @@ -9172,7 +9142,7 @@ index 77ecdb9..0f03d88 100644 1.9.1 -From 1f22fb98fc570cbeb4c422aecefd1da36616d53d Mon Sep 17 00:00:00 2001 +From a735bd44f37a072178777f1a606eb44b1a102287 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 10:40:12 +0200 Subject: [PATCH 75/85] s3:smbXsrv_tcon: don't pass smbXsrv_connection to @@ -9254,7 +9224,7 @@ index 2cbd761..48a938e 100644 1.9.1 -From a7c4a394ef0c3db5a8e0d234375d04f3a0680af4 Mon Sep 17 00:00:00 2001 +From 20826ec81037e0be8f594f8b13e94b2ee3001ca4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 09:19:29 +0200 Subject: [PATCH 76/85] s3:smb2_sesssetup: split out @@ -9348,7 +9318,7 @@ index efeac18..a8e4c38 100644 1.9.1 -From ade2b0b0896fa0a1fd57c6bd79f2bd85a66ee79a Mon Sep 17 00:00:00 2001 +From 03a50b55e68ccb520fc84fcb35c4477f575fad0f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 10:47:51 +0200 Subject: [PATCH 77/85] s3:smb2_sesssetup: make use of smb2req->[s|x]conn @@ -9464,7 +9434,7 @@ index a8e4c38..9004e69 100644 1.9.1 -From 85228e7fc219624bce80ea7654b2a493bee7a054 Mon Sep 17 00:00:00 2001 +From bd4858b8f19955e028ac02bcf125d268e53e9f26 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 09:49:28 +0200 Subject: [PATCH 78/85] s3:smbd: remember the time of the session setup @@ -9544,7 +9514,7 @@ index 9004e69..b31df84 100644 1.9.1 -From d7fdb3ffa4dc7f725b8c7f6fcf7e3f20703b14c6 Mon Sep 17 00:00:00 2001 +From bdc4c9ec1cae9260b10df571904d64a37f360148 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:40:25 +0200 Subject: [PATCH 79/85] s3:smbd: pass smbXsrv_connection explicitly to @@ -9576,7 +9546,7 @@ index a44d1bd..3e15be0 100644 ssize_t nread, size_t headersize, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index d3b6765..fff32b3 100644 +index f348666..83df104 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3026,9 +3026,9 @@ static void fail_readraw(void) @@ -9608,8 +9578,8 @@ index d3b6765..fff32b3 100644 + nread = fake_sendfile(xconn, fsp, startpos, smb_maxcnt); if (nread == -1) { - DEBUG(0,("send_file_readX: " -@@ -3850,7 +3850,7 @@ normal_read: + saved_errno = errno; +@@ -3851,7 +3851,7 @@ normal_read: errno = saved_errno; exit_server_cleanly("send_file_readX sendfile failed"); } @@ -9644,7 +9614,7 @@ index 892fa15..636f068 100644 1.9.1 -From 09e6977cbf80edf80ae47cd5abe45d2883f27516 Mon Sep 17 00:00:00 2001 +From c3c98b56716acc8cce2a44b816cf6075f16d46c0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:42:16 +0200 Subject: [PATCH 80/85] s3:smbd: pass smbXsrv_connection explicitly to @@ -9681,7 +9651,7 @@ index 3e15be0..453d829 100644 void reply_lockread(struct smb_request *req); void reply_read(struct smb_request *req); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index fff32b3..28044f1 100644 +index 83df104..a92e3a7 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3088,22 +3088,21 @@ ssize_t fake_sendfile(struct smbXsrv_connection *xconn, files_struct *fsp, @@ -9757,7 +9727,7 @@ index fff32b3..28044f1 100644 } return; } -@@ -3816,7 +3822,17 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, +@@ -3817,7 +3823,17 @@ static void send_file_readX(connection_struct *conn, struct smb_request *req, /* Deal with possible short send. */ if (nread != smb_maxcnt + sizeof(headerbuf)) { @@ -9804,12 +9774,13 @@ index 636f068..f485fe9 100644 1.9.1 -From 63e3fee83a3f68d9762adf4c6e11e0a58f8b53db Mon Sep 17 00:00:00 2001 +From c83e1e42002e66c4672cdbe53bbc0f78beddebb8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 23 Jul 2014 13:26:19 +0000 Subject: [PATCH 81/85] smbd: Use %s/__func__ Signed-off-by: Volker Lendecke +Reviewed-by: Stefan Metzmacher --- source3/smbd/smb2_read.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -9834,7 +9805,7 @@ index f485fe9..0d08114 100644 1.9.1 -From 88c5b54248ab40add9de16a4682aa27859de60e5 Mon Sep 17 00:00:00 2001 +From 44dadf31ed6d1a8427f7415e075c878a49f05970 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 11 Jul 2014 02:25:00 +0200 Subject: [PATCH 82/85] s3:smb2_server: propagate NTSTATUS from @@ -9975,7 +9946,7 @@ index d9e6a76..984d440 100644 1.9.1 -From 1839b5f314bcf66737eb46bfbb9d6e796ecc10aa Mon Sep 17 00:00:00 2001 +From 87c2b2a04f7f45ce9195e78e583e8f18e33e69db Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:43:26 +0200 Subject: [PATCH 83/85] s3:smbd: pass smbXsrv_connection to smb1 encryption @@ -10098,7 +10069,7 @@ index 7ab992e..e088d74 100644 1.9.1 -From c89154207058a2c227312608b4b5f893da26f7bc Mon Sep 17 00:00:00 2001 +From ad97c4b8e802bed070d76b8facc3bc483e956fc9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:43:26 +0200 Subject: [PATCH 84/85] s3:smb2_server: pass smbXsrv_connection to @@ -10160,7 +10131,7 @@ index 984d440..497c5dc 100644 1.9.1 -From 0f6713465e9ff7d8a34765ddb5613ea428a3ce7d Mon Sep 17 00:00:00 2001 +From 245869dae6993746391b3e8f64bd941a0452fe51 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 12 Jun 2014 08:43:26 +0200 Subject: [PATCH 85/85] s3:smbd: pass smbXsrv_connection to @@ -10271,7 +10242,7 @@ index 780a67a..7148462 100644 if (!ret) { int saved_errno = errno; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c -index 28044f1..c04c425 100644 +index a92e3a7..6c66414 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3166,12 +3166,11 @@ ssize_t sendfile_short_send(struct smbXsrv_connection *xconn, @@ -10297,7 +10268,7 @@ index 28044f1..c04c425 100644 } /**************************************************************************** -@@ -4072,9 +4071,9 @@ void reply_read_and_X(struct smb_request *req) +@@ -4073,9 +4072,9 @@ void reply_read_and_X(struct smb_request *req) /* NT_STATUS_RETRY - fall back to sync read. */ }