The branch, master has been updated
via 41edeff4164 s3:smb2_server: add message mid to SMB2 request done
log message
via dcf51b5aa58 s3:smb2_server: modernize a debug statement
from f3df83a2c34 lib/adouble: pass filesize to ad_unpack()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 41edeff416407d3eae21c7ad43d891dbacc32662
Author: Ralph Boehme <s...@samba.org>
Date: Wed Oct 30 15:05:13 2019 +0100
s3:smb2_server: add message mid to SMB2 request done log message
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Wed Oct 30 18:42:35 UTC 2019 on sn-devel-184
commit dcf51b5aa58752ddfa4fc8814c7432e34fef4330
Author: Ralph Boehme <s...@samba.org>
Date: Wed Oct 30 14:23:20 2019 +0100
s3:smb2_server: modernize a debug statement
Signed-off-by: Ralph Boehme <s...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/smbd/smb2_server.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 5a98a2e82d4..130fe5048c0 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -3148,13 +3148,20 @@ NTSTATUS smbd_smb2_request_done_ex(struct
smbd_smb2_request *req,
struct iovec *outbody_v;
struct iovec *outdyn_v;
uint32_t next_command_ofs;
+ uint64_t mid;
- DEBUG(10,("smbd_smb2_request_done_ex: "
- "idx[%d] status[%s] body[%u] dyn[%s:%u] at %s\n",
- req->current_idx, nt_errstr(status), (unsigned
int)body.length,
- dyn ? "yes": "no",
+ outhdr = SMBD_SMB2_OUT_HDR_PTR(req);
+ mid = BVAL(outhdr, SMB2_HDR_MESSAGE_ID);
+
+ DBG_DEBUG("mid [%"PRIu64"] idx[%d] status[%s] "
+ "body[%u] dyn[%s:%u] at %s\n",
+ mid,
+ req->current_idx,
+ nt_errstr(status),
+ (unsigned int)body.length,
+ dyn ? "yes" : "no",
(unsigned int)(dyn ? dyn->length : 0),
- location));
+ location);
if (body.length < 2) {
return smbd_smb2_request_error(req, NT_STATUS_INTERNAL_ERROR);
@@ -3164,7 +3171,6 @@ NTSTATUS smbd_smb2_request_done_ex(struct
smbd_smb2_request *req,
return smbd_smb2_request_error(req, NT_STATUS_INTERNAL_ERROR);
}
- outhdr = SMBD_SMB2_OUT_HDR_PTR(req);
outbody_v = SMBD_SMB2_OUT_BODY_IOV(req);
outdyn_v = SMBD_SMB2_OUT_DYN_IOV(req);
--
Samba Shared Repository
