s3:libsmb: remove unused cli_state->user_session_key

metze

diff --git a/source3/include/client.h b/source3/include/client.h
index 748f78e0f4d5616a7e067de4e1b16ee37ff9e502..f6aaceaea659f43e98f0aa0037e31d660a3cb2e6 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -77,10 +77,6 @@ struct cli_state {
        bool dfsroot;
        bool backup_intent;
 
-       /* the session key for this CLI, outside
-          any per-pipe authenticaion */
-       DATA_BLOB user_session_key;
-
        /* The list of pipes currently open on this connection. */
        struct rpc_pipe_client *pipe_list;
 

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index ea7ddfef7335fd15490461e98377ad7aa908c472..85f7fd9be7dc91127bcc38db20ce77ac926f92fd 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -72,18 +72,6 @@ static NTSTATUS smb_bytes_talloc_string(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-/**
- * Set the user session key for a connection
- * @param cli The cli structure to add it too
- * @param session_key The session key used.  (A copy of this is taken for the cli struct)
- *
- */
-
-static void cli_set_session_key (struct cli_state *cli, const DATA_BLOB session_key) 
-{
-       cli->user_session_key = data_blob(session_key.data, session_key.length);
-}
-
 /****************************************************************************
  Do an old lanman2 style session setup.
 ****************************************************************************/
@@ -1094,9 +1082,6 @@ static void cli_session_setup_nt1_done(struct tevent_req *subreq)
        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)) {
@@ -1525,8 +1510,6 @@ static void cli_session_setup_kerberos_done(struct tevent_req *subreq)
                return;
        }
 
-       cli_set_session_key(state->cli, state->session_key_krb5);
-
        if (smbXcli_conn_protocol(state->cli->conn) >= PROTOCOL_SMB2_02) {
                struct smbXcli_session *session = state->cli->smb2.session;
                status = smb2cli_session_set_session_key(session,
@@ -1727,8 +1710,6 @@ static void cli_session_setup_ntlmssp_done(struct tevent_req *subreq)
                                return;
                        }
                }
-               cli_set_session_key(
-                       state->cli, state->ntlmssp_state->session_key);
 
                if (smbXcli_conn_protocol(state->cli->conn) >= PROTOCOL_SMB2_02) {
                        struct smbXcli_session *session = state->cli->smb2.session;

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index ae0350b46556d0be8bb5a929ebb37ceecd6bd3dd..31af1e7e2486ccf83d83bd744e8cb386cb8c25e4 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -325,8 +325,6 @@ static void _cli_shutdown(struct cli_state *cli)
        if (cli_state_has_tcon(cli)) {
                cli_tdis(cli);
        }
-        
-       data_blob_free(&cli->user_session_key);
 
        smbXcli_conn_disconnect(cli->conn, NT_STATUS_OK);