From: Andreas Schneider <asn@samba.org>
Date: Wed, 14 Aug 2019 10:17:20 +0000 (+0200)
Subject: s3:libads: Don't set supported encryption types during account creation
X-Git-Tag: talloc-2.3.1~456
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b755a6438022579dab1a403c81d60b1ed7efca38;p=thirdparty%2Fsamba.git

s3:libads: Don't set supported encryption types during account creation

This is already handled by libnet_join_post_processing_ads_modify()
which calls libnet_join_set_etypes() if encrytion types should be set.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
---

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index ce6d6077cf7..7c35c6b806a 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -2127,12 +2127,6 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
 	uint32_t acct_control = ( UF_WORKSTATION_TRUST_ACCOUNT |\
 	                        UF_DONT_EXPIRE_PASSWD |\
 			        UF_ACCOUNTDISABLE );
-	uint32_t func_level = 0;
-
-	ret = ads_domain_func_level(ads, &func_level);
-	if (!ADS_ERR_OK(ret)) {
-		return ret;
-	}
 
 	ctx = talloc_init("ads_add_machine_acct");
 	if (ctx == NULL) {
@@ -2184,18 +2178,6 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads,
 	ads_mod_strlist(ctx, &mods, "objectClass", objectClass);
 	ads_mod_str(ctx, &mods, "userAccountControl", controlstr);
 
-	if (func_level >= DS_DOMAIN_FUNCTION_2008) {
-		const char *etype_list_str;
-
-		etype_list_str = talloc_asprintf(ctx, "%d", (int)etype_list);
-		if (etype_list_str == NULL) {
-			ret = ADS_ERROR(LDAP_NO_MEMORY);
-			goto done;
-		}
-		ads_mod_str(ctx, &mods, "msDS-SupportedEncryptionTypes",
-			    etype_list_str);
-	}
-
 	ret = ads_gen_add(ads, new_dn, mods);
 
 done: