From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 14 Jan 2012 04:17:41 +0000 (+1100)
Subject: s3-libsmb: Remove unused enum smb_trans_enc_type
X-Git-Tag: tevent-0.9.15~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fce53e0e794f38782092be3433608772f5be7f2b;p=thirdparty%2Fsamba.git

s3-libsmb: Remove unused enum smb_trans_enc_type

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/libcli/smb/smb_seal.h b/libcli/smb/smb_seal.h
index 081208e3340..01a61e85861 100644
--- a/libcli/smb/smb_seal.h
+++ b/libcli/smb/smb_seal.h
@@ -20,14 +20,7 @@
 #ifndef _HEADER_SMB_CRYPT_H
 #define _HEADER_SMB_CRYPT_H
 
-/* Transport encryption state. */
-enum smb_trans_enc_type {
-		SMB_TRANS_ENC_NTLM,
-		SMB_TRANS_ENC_GSS
-};
-
 struct smb_trans_enc_state {
-        enum smb_trans_enc_type smb_enc_type;
         uint16_t enc_ctx_num;
         bool enc_on;
 	struct gensec_security *gensec_security;
diff --git a/source3/libsmb/clifsinfo.c b/source3/libsmb/clifsinfo.c
index 8c31b7f8c28..0b2d292d36b 100644
--- a/source3/libsmb/clifsinfo.c
+++ b/source3/libsmb/clifsinfo.c
@@ -576,7 +576,7 @@ static NTSTATUS enc_blob_send_receive(struct cli_state *cli, DATA_BLOB *in, DATA
  Make a client state struct.
 ******************************************************************************/
 
-static struct smb_trans_enc_state *make_cli_enc_state(enum smb_trans_enc_type smb_enc_type)
+static struct smb_trans_enc_state *make_cli_enc_state(void)
 {
 	struct smb_trans_enc_state *es = NULL;
 	es = SMB_MALLOC_P(struct smb_trans_enc_state);
@@ -584,7 +584,6 @@ static struct smb_trans_enc_state *make_cli_enc_state(enum smb_trans_enc_type sm
 		return NULL;
 	}
 	ZERO_STRUCTP(es);
-	es->smb_enc_type = smb_enc_type;
 
 	return es;
 }
@@ -603,7 +602,7 @@ NTSTATUS cli_raw_ntlm_smb_encryption_start(struct cli_state *cli,
 	DATA_BLOB param_out = data_blob_null;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	struct auth_generic_state *auth_generic_state;
-	struct smb_trans_enc_state *es = make_cli_enc_state(SMB_TRANS_ENC_NTLM);
+	struct smb_trans_enc_state *es = make_cli_enc_state();
 
 	if (!es) {
 		return NT_STATUS_NO_MEMORY;
@@ -685,7 +684,7 @@ NTSTATUS cli_gss_smb_encryption_start(struct cli_state *cli)
 	DATA_BLOB param_out = data_blob_null;
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	struct auth_generic_state *auth_generic_state;
-	struct smb_trans_enc_state *es = make_cli_enc_state(SMB_TRANS_ENC_GSS);
+	struct smb_trans_enc_state *es = make_cli_enc_state();
 
 	if (!es) {
 		return NT_STATUS_NO_MEMORY;