summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-03-07 16:56:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:11:01 -0500
commit3432273ab0f647e60960152514c1df87093614af (patch)
tree1cf5dbeacf7d626849cba93133afb9a983222d24
parentbd8e1b442d8493beecd8042d23e0875bd0679207 (diff)
downloadsamba-3432273ab0f647e60960152514c1df87093614af.tar.gz
samba-3432273ab0f647e60960152514c1df87093614af.tar.bz2
samba-3432273ab0f647e60960152514c1df87093614af.zip
r13965: Make sure we always reset the userAccountControl bits when re-joining
with an existing account. Guenther (This used to be commit e4c12ab167ee83772a2bdd1946b8d73613fc0d7e)
-rw-r--r--source3/libads/ldap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 26b86f64d1..babbabdd80 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1526,9 +1526,9 @@ static ADS_STATUS ads_add_machine_acct(ADS_STRUCT *ads, const char *machine_name
if (!exists) {
ads_mod_str(ctx, &mods, "cn", machine_name);
ads_mod_str(ctx, &mods, "sAMAccountName", samAccountName);
- ads_mod_str(ctx, &mods, "userAccountControl", controlstr);
ads_mod_strlist(ctx, &mods, "objectClass", objectClass);
}
+ ads_mod_str(ctx, &mods, "userAccountControl", controlstr);
ads_mod_str(ctx, &mods, "dNSHostName", my_fqdn);
ads_mod_str(ctx, &mods, "userPrincipalName", host_upn);
ads_mod_strlist(ctx, &mods, "servicePrincipalName", servicePrincipalName);