diff options
| author | Andreas Schneider <asn@samba.org> | 2019-08-14 12:17:20 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-10-16 12:15:54 +0000 |
| commit | ac8c51fbb5611d5bd2c34cb5693a32238ef64cac (patch) | |
| tree | f29a7afcf6d56b4a9bf761abd5421e3fce46ac9c | |
| parent | f5216b70c373e3acffc1d75f6efa3e8d273a41fe (diff) | |
| download | samba-ac8c51fbb5611d5bd2c34cb5693a32238ef64cac.tar.gz | |
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>
(cherry picked from commit b755a6438022579dab1a403c81d60b1ed7efca38)
| -rw-r--r-- | source3/libads/ldap.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c index ec6ad61a55c..8fbd97e25e2 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: |