summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-01 09:41:53 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-01 14:17:14 +0200
commit00cde56bfdf09cf71d2435f02280b44c2bb35183 (patch)
tree4c532ed09af1faffa02fec4b0923485925a70936 /source4
parent7977d90f1e88d0c23b4a14ffd15bf8c077c9d701 (diff)
downloadsamba-00cde56bfdf09cf71d2435f02280b44c2bb35183.tar.gz
samba-00cde56bfdf09cf71d2435f02280b44c2bb35183.tar.bz2
samba-00cde56bfdf09cf71d2435f02280b44c2bb35183.zip
s4:libcli/raw: remove unused smbcli_session->user_session_key
metze
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/raw/libcliraw.h2
-rw-r--r--source4/libcli/smb_composite/connect.c1
-rw-r--r--source4/libcli/smb_composite/sesssetup.c14
3 files changed, 0 insertions, 17 deletions
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
@@ -65,17 +65,6 @@ static NTSTATUS session_setup_spnego(struct composite_context *c,
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
*/
static void request_handler(struct smbcli_request *req)
@@ -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);