From: Luk Claes <luk@debian.org>
Date: Sat, 19 May 2012 16:32:51 +0000 (+0200)
Subject: s3:libsmb: get rid of cli_state_server_session_key
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7c69ca09d0a847262b3e5981c12331c70bf1ce35;p=mat%2Fsamba.git

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>
---

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);