sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s3:libsmb: make use of smb1cli_session_set_session_key()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher
2012-08-01 08:54:51 +02:00
parent 7af537e66f
commit c9eac1af14
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source3/libsmb/cliconnect.c
View File

@ -1092,8 +1092,16 @@ static void cli_session_setup_nt1_done(struct tevent_req *subreq)
return;
}
if (state->session_key.data) {
struct smbXcli_session *session = state->cli->smb1.session;
/* Have plaintext orginal */
cli_set_session_key(cli, state->session_key);
status = smb1cli_session_set_session_key(session,
state->session_key);
if (tevent_req_nterror(req, status)) {
return;
}
}
tevent_req_done(req);
}
@ -1528,6 +1536,14 @@ static void cli_session_setup_kerberos_done(struct tevent_req *subreq)
return;
}
} else {
struct smbXcli_session *session = state->cli->smb1.session;
status = smb1cli_session_set_session_key(session,
state->session_key_krb5);
if (tevent_req_nterror(req, status)) {
return;
}
if (smb1cli_conn_activate_signing(state->cli->conn, state->session_key_krb5,
data_blob_null)
&& !smb1cli_conn_check_signing(state->cli->conn, inbuf, 1)) {
@ -1739,6 +1755,14 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq)
return;
}
} else {
struct smbXcli_session *session = state->cli->smb1.session;
status = smb1cli_session_set_session_key(session,
state->ntlmssp_state->session_key);
if (tevent_req_nterror(req, status)) {
return;
}
if (smb1cli_conn_activate_signing(
state->cli->conn, state->ntlmssp_state->session_key,
data_blob_null)