diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-05 18:22:57 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-09-07 08:32:05 +0200 |
| commit | 35d4afc3e0a364328e5fd1e3789ec18705c2c482 (patch) | |
| tree | 5bd267f3a35cc0f3530c46bd2062b2910e0cd869 | |
| parent | 9646d802b72fcb42423960ae73aa919ba47cc823 (diff) | |
| download | samba-35d4afc3e0a364328e5fd1e3789ec18705c2c482.tar.gz samba-35d4afc3e0a364328e5fd1e3789ec18705c2c482.tar.bz2 samba-35d4afc3e0a364328e5fd1e3789ec18705c2c482.zip | |
s3:smb2cli: SMB2_SESSION_SETUP needs one dyn byte to that the structure size check works.
Windows generates NT_STATUS_INVALID_PARAMETER otherwise.
metze
| -rw-r--r-- | source3/libsmb/smb2cli_session.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c index b1f7c33f61..0fd91a8018 100644 --- a/source3/libsmb/smb2cli_session.c +++ b/source3/libsmb/smb2cli_session.c @@ -30,6 +30,7 @@ struct smb2cli_sesssetup_blob_state { struct ntlmssp_state *ntlmssp; uint8_t fixed[24]; + uint8_t dyn_pad[1]; uint64_t uid; DATA_BLOB out; }; @@ -44,6 +45,8 @@ static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx, struct tevent_req *req, *subreq; struct smb2cli_sesssetup_blob_state *state; uint8_t *buf; + uint8_t *dyn; + size_t dyn_len; req = tevent_req_create(mem_ctx, &state, struct smb2cli_sesssetup_blob_state); @@ -62,12 +65,20 @@ static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx, SSVAL(buf, 14, blob->length); SBVAL(buf, 16, 0); /* PreviousSessionId */ + if (blob->length > 0) { + dyn = blob->data; + dyn_len = blob->length; + } else { + dyn = state->dyn_pad;; + dyn_len = sizeof(state->dyn_pad); + } + subreq = smb2cli_req_send(state, ev, cli, SMB2_OP_SESSSETUP, 0, 0, /* flags */ cli->smb2.pid, 0, 0, /* tid, uid */ state->fixed, sizeof(state->fixed), - blob->data, blob->length); + dyn, dyn_len); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); } |