summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-01-14 15:17:41 +1100
committerStefan Metzmacher <metze@samba.org>2012-01-31 20:17:10 +0100
commitfce53e0e794f38782092be3433608772f5be7f2b (patch)
tree34d14bb66dd9735b172c09fe6ea3dd98f697594f
parenta1a667dd37d0218eda56bd2033a24cdff2dc8ea2 (diff)
downloadsamba-fce53e0e794f38782092be3433608772f5be7f2b.tar.gz
samba-fce53e0e794f38782092be3433608772f5be7f2b.tar.bz2
samba-fce53e0e794f38782092be3433608772f5be7f2b.zip
s3-libsmb: Remove unused enum smb_trans_enc_type
Signed-off-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r--libcli/smb/smb_seal.h7
-rw-r--r--source3/libsmb/clifsinfo.c7
2 files changed, 3 insertions, 11 deletions
diff --git a/libcli/smb/smb_seal.h b/libcli/smb/smb_seal.h
index 081208e334..01a61e8586 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 8c31b7f8c2..0b2d292d36 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;