s3-libsmb: Remove unused enum smb_trans_enc_type
authorAndrew Bartlett <abartlet@samba.org>
Sat, 14 Jan 2012 04:17:41 +0000 (15:17 +1100)
committerStefan Metzmacher <metze@samba.org>
Tue, 31 Jan 2012 19:17:10 +0000 (20:17 +0100)
Signed-off-by: Stefan Metzmacher <metze@samba.org>
libcli/smb/smb_seal.h
source3/libsmb/clifsinfo.c

index 081208e3340a4d1d5b0ac575a7bce3bc763b60fc..01a61e858614b10722d1a953ca8c1eb01f2fa76f 100644 (file)
 #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;
index 8c31b7f8c28c981c4a2fd87a39d6d32035c0880e..0b2d292d36b06648a72811a8c2c5602f3925a3d9 100644 (file)
@@ -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;