diff options
| author | Luk Claes <luk@debian.org> | 2012-05-19 18:42:56 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2012-05-28 14:49:47 +0200 |
| commit | 2be7e23b99db92cf55421607a67911f0ecae3790 (patch) | |
| tree | 4bd8a2f35f2e11cb34c528c9e613e7253079c954 | |
| parent | ab052c7ff0cdaa7b64c20e2d658e4c46d6c66234 (diff) | |
| download | samba-2be7e23b99db92cf55421607a67911f0ecae3790.tar.gz samba-2be7e23b99db92cf55421607a67911f0ecae3790.tar.bz2 samba-2be7e23b99db92cf55421607a67911f0ecae3790.zip | |
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>
| -rw-r--r-- | source3/libsmb/cliconnect.c | 10 | ||||
| -rw-r--r-- | source3/libsmb/clientgen.c | 5 | ||||
| -rw-r--r-- | source3/libsmb/proto.h | 1 |
3 files changed, 5 insertions, 11 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index 69b1d712ce..f714d3d1b4 100644 --- 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 5d2d038965..65ceffc0e8 100644 --- 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 7b44b15688..2d03814c11 100644 --- 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); |