summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-12-24 22:07:19 +0100
committerStefan Metzmacher <metze@samba.org>2009-12-29 08:46:12 +0100
commit05f7a86a997be45eb23ffc349f79572d570f10ab (patch)
treeec1ea2bd0dfe41cdf8bb72b05f12ff9ced4a7c55
parent7cff7d937e067642f76a1785696653ec07a5495c (diff)
downloadsamba-05f7a86a997be45eb23ffc349f79572d570f10ab.tar.gz
samba-05f7a86a997be45eb23ffc349f79572d570f10ab.tar.bz2
samba-05f7a86a997be45eb23ffc349f79572d570f10ab.zip
s3:ntlmssp: remove unused ntlmssp_stored_response()
metze
-rw-r--r--source3/include/ntlmssp.h5
-rw-r--r--source3/include/proto.h2
-rw-r--r--source3/libsmb/ntlmssp.c26
3 files changed, 1 insertions, 32 deletions
diff --git a/source3/include/ntlmssp.h b/source3/include/ntlmssp.h
index 83c75ea4ff..f30b53f094 100644
--- a/source3/include/ntlmssp.h
+++ b/source3/include/ntlmssp.h
@@ -131,9 +131,4 @@ struct ntlmssp_state
/* ntlmv1 */
struct arcfour_state ntlmv1_arc4_state;
uint32_t ntlmv1_seq_num;
-
- /* it turns out that we don't always get the
- response in at the time we want to process it.
- Store it here, until we need it */
- DATA_BLOB stored_response;
};
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f81ab91603..87701bf0b5 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -3218,8 +3218,6 @@ NTSTATUS ntlmssp_set_hashes(struct ntlmssp_state *ntlmssp_state,
NTSTATUS ntlmssp_set_password(struct ntlmssp_state *ntlmssp_state, const char *password) ;
NTSTATUS ntlmssp_set_domain(struct ntlmssp_state *ntlmssp_state, const char *domain) ;
NTSTATUS ntlmssp_set_workstation(struct ntlmssp_state *ntlmssp_state, const char *workstation) ;
-NTSTATUS ntlmssp_store_response(struct ntlmssp_state *ntlmssp_state,
- DATA_BLOB response) ;
void ntlmssp_want_feature_list(struct ntlmssp_state *ntlmssp_state, char *feature_list);
void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32 feature);
NTSTATUS ntlmssp_update(struct ntlmssp_state *ntlmssp_state,
diff --git a/source3/libsmb/ntlmssp.c b/source3/libsmb/ntlmssp.c
index 6ce7718bf1..aaa5031951 100644
--- a/source3/libsmb/ntlmssp.c
+++ b/source3/libsmb/ntlmssp.c
@@ -223,20 +223,6 @@ NTSTATUS ntlmssp_set_workstation(struct ntlmssp_state *ntlmssp_state, const char
}
/**
- * Store a DATA_BLOB containing an NTLMSSP response, for use later.
- * This copies the data blob
- */
-
-NTSTATUS ntlmssp_store_response(struct ntlmssp_state *ntlmssp_state,
- DATA_BLOB response)
-{
- ntlmssp_state->stored_response = data_blob_talloc(ntlmssp_state,
- response.data,
- response.length);
- return NT_STATUS_OK;
-}
-
-/**
* Request features for the NTLMSSP negotiation
*
* @param ntlmssp_state NTLMSSP state
@@ -290,9 +276,8 @@ void ntlmssp_want_feature(struct ntlmssp_state *ntlmssp_state, uint32 feature)
*/
NTSTATUS ntlmssp_update(struct ntlmssp_state *ntlmssp_state,
- const DATA_BLOB in, DATA_BLOB *out)
+ const DATA_BLOB input, DATA_BLOB *out)
{
- DATA_BLOB input;
uint32 ntlmssp_command;
int i;
@@ -304,15 +289,6 @@ NTSTATUS ntlmssp_update(struct ntlmssp_state *ntlmssp_state,
*out = data_blob_null;
- if (!in.length && ntlmssp_state->stored_response.length) {
- input = ntlmssp_state->stored_response;
-
- /* we only want to read the stored response once - overwrite it */
- ntlmssp_state->stored_response = data_blob_null;
- } else {
- input = in;
- }
-
if (!input.length) {
switch (ntlmssp_state->role) {
case NTLMSSP_CLIENT: