From 6de578a8f7a4ed2defeb778c089bdff0b8cef6cd Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sat, 31 Mar 2012 01:15:36 -0400 Subject: s4-auth-krb: Move function to db-glue.c and make it static. kerberos_enctype_to_bitmap is not used anywhere else, so just move it there and make it static, one less dependency to worry about. Signed-off-by: Andreas Schneider --- source4/auth/kerberos/kerberos.h | 1 - source4/auth/kerberos/kerberos_util.c | 19 ------------------- 2 files changed, 20 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index b5d655a058..c57b13eb15 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -116,7 +116,6 @@ NTSTATUS kerberos_pac_logon_info(TALLOC_CTX *mem_ctx, struct loadparm_context; struct ldb_message; struct ldb_context; -uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum); krb5_error_code smb_krb5_update_keytab(TALLOC_CTX *parent_ctx, struct smb_krb5_context *smb_krb5_context, struct ldb_context *ldb, diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index 4798df0ee9..f38bc17212 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -347,22 +347,3 @@ krb5_error_code smb_krb5_get_keytab_container(TALLOC_CTX *mem_ctx, return 0; } - -/* Translate between the IETF encryption type values and the Microsoft msDS-SupportedEncryptionTypes values */ -uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum) -{ - switch (enc_type_enum) { - case ENCTYPE_DES_CBC_CRC: - return ENC_CRC32; - case ENCTYPE_DES_CBC_MD5: - return ENC_RSA_MD5; - case ENCTYPE_ARCFOUR_HMAC_MD5: - return ENC_RC4_HMAC_MD5; - case ENCTYPE_AES128_CTS_HMAC_SHA1_96: - return ENC_HMAC_SHA1_96_AES128; - case ENCTYPE_AES256_CTS_HMAC_SHA1_96: - return ENC_HMAC_SHA1_96_AES256; - default: - return 0; - } -} -- cgit