s3:libsmb: get rid of cli_state_server_challenge

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 69b1d712ceba76bba3b80824e0b18622317a697d..f714d3d1b4c2628ea3c8ee1c60011a3a38b668df 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -138,7 +138,7 @@ static struct tevent_req *cli_session_setup_lanman2_send(
                        return tevent_req_post(req, ev);
                }
 
-               if (!SMBencrypt(pass, cli_state_server_challenge(cli),
+               if (!SMBencrypt(pass, smb1cli_conn_server_challenge(cli->conn),
                                (uint8_t *)lm_response.data)) {
                        DEBUG(1, ("Password is > 14 chars in length, and is "
                                  "therefore incompatible with Lanman "
@@ -834,7 +834,7 @@ static struct tevent_req *cli_session_setup_nt1_send(
                        DATA_BLOB names_blob;
 
                        server_chal =
-                               data_blob_const(cli_state_server_challenge(cli),
+                               data_blob_const(smb1cli_conn_server_challenge(cli->conn),
                                                8);
 
                        /*
@@ -873,7 +873,7 @@ static struct tevent_req *cli_session_setup_nt1_send(
                                return tevent_req_post(req, ev);
                        }
 
-                       SMBNTencrypt(pass, cli_state_server_challenge(cli),
+                       SMBNTencrypt(pass, smb1cli_conn_server_challenge(cli->conn),
                                     nt_response.data);
 #endif
                        /* non encrypted password supplied. Ignore ntpass. */
@@ -885,7 +885,7 @@ static struct tevent_req *cli_session_setup_nt1_send(
                                }
 
                                if (!SMBencrypt(pass,
-                                               cli_state_server_challenge(cli),
+                                               smb1cli_conn_server_challenge(cli->conn),
                                                lm_response.data)) {
                                        /*
                                         * Oops, the LM response is
@@ -2282,7 +2282,7 @@ struct tevent_req *cli_tcon_andx_create(TALLOC_CTX *mem_ctx,
                 * Non-encrypted passwords - convert to DOS codepage before
                 * encryption.
                 */
-               SMBencrypt(pass, cli_state_server_challenge(cli), p24);
+               SMBencrypt(pass, smb1cli_conn_server_challenge(cli->conn), p24);
                passlen = 24;
                pass = (const char *)p24;
        } else {

diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index 5d2d0389658969b8a30505d836080c86050684ba..65ceffc0e8349e64e287da8971f9bb1609ef7885 100644 (file)
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -437,11 +437,6 @@ uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs)
        return ret;
 }
 
-const uint8_t *cli_state_server_challenge(struct cli_state *cli)
-{
-       return smb1cli_conn_server_challenge(cli->conn);
-}
-
 const DATA_BLOB *cli_state_server_gss_blob(struct cli_state *cli)
 {
        return smbXcli_conn_server_gss_blob(cli->conn);

diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 7b44b15688fc7ac1cfd4c73b6a689b0f17daf584..2d03814c117c5cf7d4dfe96877b4ea02c0fc9fdf 100644 (file)
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -181,7 +181,6 @@ uint16_t cli_state_get_uid(struct cli_state *cli);
 uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid);
 bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive);
 uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs);
-const uint8_t *cli_state_server_challenge(struct cli_state *cli);
 const DATA_BLOB *cli_state_server_gss_blob(struct cli_state *cli);
 uint16_t cli_state_security_mode(struct cli_state *cli);
 int cli_state_server_time_zone(struct cli_state *cli);