summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuk Claes <luk@debian.org>2012-05-19 18:32:51 +0200
committerStefan Metzmacher <metze@samba.org>2012-05-28 14:49:46 +0200
commit7c69ca09d0a847262b3e5981c12331c70bf1ce35 (patch)
treecb5ebbdded3e5229ecc605cac4be90fcf3ccd042
parent3c9c06ac05635dc0af3b29b15c3f568cbf57afdd (diff)
downloadsamba-7c69ca09d0a847262b3e5981c12331c70bf1ce35.tar.gz
samba-7c69ca09d0a847262b3e5981c12331c70bf1ce35.tar.bz2
samba-7c69ca09d0a847262b3e5981c12331c70bf1ce35.zip
s3:libsmb: get rid of cli_state_server_session_key
Signed-off-by: Luk Claes <luk@debian.org> Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--source3/libsmb/cliconnect.c8
-rw-r--r--source3/libsmb/clientgen.c5
-rw-r--r--source3/libsmb/proto.h1
3 files changed, 4 insertions, 10 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 3a4850d3d6..69b1d712ce 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -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);
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index ac59e8b315..92a62bb437 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -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.
****************************************************************************/
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 9662b92d6a..294e2a7b76 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -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);