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

s3:libsmb: get rid of cli_state_server_session_key

Browse Source 
Signed-off-by: Luk Claes <luk@debian.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Luk Claes
2012-05-19 18:32:51 +02:00
committed by Stefan Metzmacher
parent 3c9c06ac05
commit 7c69ca09d0
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/libsmb/cliconnect.c
View File

@ -181,7 +181,7 @@ static struct tevent_req *cli_session_setup_lanman2_send(
SSVAL(vwv+2, 0, CLI_BUFFER_SIZE);
SSVAL(vwv+3, 0, 2);
SSVAL(vwv+4, 0, 1);
SIVAL(vwv+5, 0, cli_state_server_session_key(cli));
SIVAL(vwv+5, 0, smb1cli_conn_server_session_key(cli->conn));
SSVAL(vwv+7, 0, lm_response.length);
bytes = talloc_array(state, uint8_t, lm_response.length);
@ -406,7 +406,7 @@ struct tevent_req *cli_session_setup_guest_create(TALLOC_CTX *mem_ctx,
SSVAL(vwv+2, 0, CLI_BUFFER_SIZE);
SSVAL(vwv+3, 0, 2);
SSVAL(vwv+4, 0, cli_state_get_vc_num(cli));
SIVAL(vwv+5, 0, cli_state_server_session_key(cli));
SIVAL(vwv+5, 0, smb1cli_conn_server_session_key(cli->conn));
SSVAL(vwv+7, 0, 0);
SSVAL(vwv+8, 0, 0);
SSVAL(vwv+9, 0, 0);
@ -621,7 +621,7 @@ static struct tevent_req *cli_session_setup_plain_send(
SSVAL(vwv+2, 0, CLI_BUFFER_SIZE);
SSVAL(vwv+3, 0, 2);
SSVAL(vwv+4, 0, cli_state_get_vc_num(cli));
SIVAL(vwv+5, 0, cli_state_server_session_key(cli));
SIVAL(vwv+5, 0, smb1cli_conn_server_session_key(cli->conn));
SSVAL(vwv+7, 0, 0);
SSVAL(vwv+8, 0, 0);
SSVAL(vwv+9, 0, 0);
@ -963,7 +963,7 @@ static struct tevent_req *cli_session_setup_nt1_send(
SSVAL(vwv+2, 0, CLI_BUFFER_SIZE);
SSVAL(vwv+3, 0, 2);
SSVAL(vwv+4, 0, cli_state_get_vc_num(cli));
SIVAL(vwv+5, 0, cli_state_server_session_key(cli));
SIVAL(vwv+5, 0, smb1cli_conn_server_session_key(cli->conn));
SSVAL(vwv+7, 0, lm_response.length);
SSVAL(vwv+8, 0, nt_response.length);
SSVAL(vwv+9, 0, 0);

5
source3/libsmb/clientgen.c
View File

@ -370,11 +370,6 @@ uint16_t cli_state_get_vc_num(struct cli_state *cli)
return cli->smb1.vc_num;
}
uint32_t cli_state_server_session_key(struct cli_state *cli)
{
return smb1cli_conn_server_session_key(cli->conn);
}
/****************************************************************************
Set the PID to use for smb messages. Return the old pid.
****************************************************************************/

1
source3/libsmb/proto.h
View File

@ -173,7 +173,6 @@ void cli_nt_pipes_close(struct cli_state *cli);
void cli_shutdown(struct cli_state *cli);
const char *cli_state_remote_realm(struct cli_state *cli);
uint16_t cli_state_get_vc_num(struct cli_state *cli);
uint32_t cli_state_server_session_key(struct cli_state *cli);
uint16 cli_setpid(struct cli_state *cli, uint16 pid);
uint16_t cli_getpid(struct cli_state *cli);
bool cli_state_has_tcon(struct cli_state *cli);