From 00cde56bfdf09cf71d2435f02280b44c2bb35183 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 1 Aug 2012 09:41:53 +0200 Subject: s4:libcli/raw: remove unused smbcli_session->user_session_key metze --- source4/libcli/raw/libcliraw.h | 2 -- source4/libcli/smb_composite/connect.c | 1 - source4/libcli/smb_composite/sesssetup.c | 14 -------------- 3 files changed, 17 deletions(-) (limited to 'source4/libcli') diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index b269471081..a246ade7b6 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -166,8 +166,6 @@ struct smbcli_session { the user to control these for torture testing */ uint16_t flags2; - DATA_BLOB user_session_key; - /* the spnego context if we use extented security */ struct gensec_security *gensec; diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index 0688684e95..80ce5562d2 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -163,7 +163,6 @@ static NTSTATUS connect_session_setup(struct composite_context *c, * have been given a uid in the NTLMSSP_CHALLENGE reply. This * would lead to an invalid uid in the anonymous fallback */ state->session->vuid = 0; - data_blob_free(&state->session->user_session_key); talloc_free(state->session->gensec); state->session->gensec = NULL; diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c index fab2ce9c85..00230135a6 100644 --- a/source4/libcli/smb_composite/sesssetup.c +++ b/source4/libcli/smb_composite/sesssetup.c @@ -64,17 +64,6 @@ static NTSTATUS session_setup_spnego(struct composite_context *c, struct smb_composite_sesssetup *io, struct smbcli_request **req); -/* - store the user session key for a transport -*/ -static void set_user_session_key(struct smbcli_session *session, - const DATA_BLOB *session_key) -{ - session->user_session_key = data_blob_talloc(session, - session_key->data, - session_key->length); -} - /* handler for completion of a smbcli_request sub-request */ @@ -207,7 +196,6 @@ static void request_handler(struct smbcli_request *req) session_key, null_data_blob); } - set_user_session_key(session, &session_key); c->status = smb1cli_session_set_session_key(session->smbXcli, session_key); @@ -350,7 +338,6 @@ static NTSTATUS session_setup_nt1(struct composite_context *c, smb1cli_conn_activate_signing(session->transport->conn, session_key, state->setup.nt1.in.password2); - set_user_session_key(session, &session_key); nt_status = smb1cli_session_set_session_key(session->smbXcli, session_key); @@ -415,7 +402,6 @@ static NTSTATUS session_setup_old(struct composite_context *c, NULL, NULL, &session_key); NT_STATUS_NOT_OK_RETURN(nt_status); - set_user_session_key(session, &session_key); nt_status = smb1cli_session_set_session_key(session->smbXcli, session_key); -- cgit