diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-07-31 07:48:16 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-07-31 07:48:16 +1000 |
| commit | 337752cfd82dc3dbdf918fd45eddd1aa8fb04576 (patch) | |
| tree | 79aa04fbf294add814fb060f73a1909733b18ec4 /source4/libcli/smb2/session.c | |
| parent | 2a0677e514b5b9f91d32339077cc7e4187525c3b (diff) | |
| parent | e45c3e127d389a2cb63879ca12bbbfed048f4eb1 (diff) | |
| download | samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.tar.gz samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.tar.bz2 samba-337752cfd82dc3dbdf918fd45eddd1aa8fb04576.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 15d0951b74b46763024560f9cd012338473c5bc3)
Diffstat (limited to 'source4/libcli/smb2/session.c')
| -rw-r--r-- | source4/libcli/smb2/session.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/smb2/session.c b/source4/libcli/smb2/session.c index 91616319d5..31b3e942e9 100644 --- a/source4/libcli/smb2/session.c +++ b/source4/libcli/smb2/session.c @@ -187,14 +187,14 @@ static void session_request_handler(struct smb2_request *req) return; } - if (session->transport->signing.doing_signing) { - if (session->session_key.length != 16) { - DEBUG(2,("Wrong session key length %u for SMB2 signing\n", + if (session->transport->signing_required) { + if (session->session_key.length == 0) { + DEBUG(0,("Wrong session key length %u for SMB2 signing\n", (unsigned)session->session_key.length)); composite_error(c, NT_STATUS_ACCESS_DENIED); return; } - session->transport->signing.signing_started = true; + session->signing_active = true; } composite_done(c); @@ -218,7 +218,7 @@ struct composite_context *smb2_session_setup_spnego_send(struct smb2_session *se ZERO_STRUCT(state->io); state->io.in.vc_number = 0; - if (session->transport->signing.doing_signing) { + if (session->transport->signing_required) { state->io.in.security_mode = SMB2_NEGOTIATE_SIGNING_ENABLED | SMB2_NEGOTIATE_SIGNING_REQUIRED; } |