From: Karolin Seeger <kseeger@samba.org>
Date: Wed, 21 Feb 2018 09:15:22 +0000 (+0100)
Subject: Revert "TODO s4:kdc: msDS-SupportedEncryptionTypes only on computers"
X-Git-Tag: samba-4.6.15~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cd690617547366562fb1deed049f0c7ab129b3e;p=thirdparty%2Fsamba.git

Revert "TODO s4:kdc: msDS-SupportedEncryptionTypes only on computers"

This reverts commit fe146338f304a52f861777ada5774887fe0776e3.
---

diff --git a/source4/kdc/db-glue.c b/source4/kdc/db-glue.c
index 2b7b5d6823c..bf55befddf8 100644
--- a/source4/kdc/db-glue.c
+++ b/source4/kdc/db-glue.c
@@ -288,14 +288,6 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 					    "msDS-SupportedEncryptionTypes",
 					    0);
 
-	if (userAccountControl & UF_NORMAL_ACCOUNT) {
-		supported_enctypes = 0;
-	}
-	if (supported_enctypes == 0) {
-		/* Otherwise, add in the default enc types */
-		supported_enctypes |= ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5;
-	}
-
 	if (rid == DOMAIN_RID_KRBTGT || is_rodc) {
 		/* KDCs (and KDCs on RODCs) use AES */
 		supported_enctypes |= ENC_HMAC_SHA1_96_AES128 | ENC_HMAC_SHA1_96_AES256;
@@ -316,7 +308,7 @@ static krb5_error_code samba_kdc_message2entry_keys(krb5_context context,
 	/* If UF_USE_DES_KEY_ONLY has been set, then don't allow use of the newer enc types */
 	if (userAccountControl & UF_USE_DES_KEY_ONLY) {
 		supported_enctypes = ENC_CRC32|ENC_RSA_MD5;
-	} else if (supported_enctypes == 0) {
+	} else {
 		/* Otherwise, add in the default enc types */
 		supported_enctypes |= ENC_CRC32 | ENC_RSA_MD5 | ENC_RC4_HMAC_MD5;
 	}