svn commit: samba r12406 - branches/SAMBA_3_0/source/libads trunk/source/libads

[gd at samba.org]

Author: gd
Date: 2005-12-21 10:05:39 +0000 (Wed, 21 Dec 2005)
New Revision: 12406

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12406

Log:
Since w2k3 sp1 we fail to create user accounts using e.g. "net ads user
add" with "Server is unwilling to perform". Seems we have to put in the
same userAccountControl bits the server would pick when we wouldn't send
them at all.

Guenther

Modified:
   branches/SAMBA_3_0/source/libads/ldap_user.c
   trunk/source/libads/ldap_user.c


Changeset:
Modified: branches/SAMBA_3_0/source/libads/ldap_user.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ldap_user.c	2005-12-21 09:08:38 UTC (rev 12405)
+++ branches/SAMBA_3_0/source/libads/ldap_user.c	2005-12-21 10:05:39 UTC (rev 12406)
@@ -65,7 +65,7 @@
 	if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container,
 				       ads->config.bind_path)))
 		goto done;
-	if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT)))
+	if (!(controlstr = talloc_asprintf(ctx, "%u", (UF_NORMAL_ACCOUNT | UF_ACCOUNTDISABLE))))
 		goto done;
 	if (!(mods = ads_init_mods(ctx)))
 		goto done;

Modified: trunk/source/libads/ldap_user.c
===================================================================
--- trunk/source/libads/ldap_user.c	2005-12-21 09:08:38 UTC (rev 12405)
+++ trunk/source/libads/ldap_user.c	2005-12-21 10:05:39 UTC (rev 12406)
@@ -65,7 +65,7 @@
 	if (!(new_dn = talloc_asprintf(ctx, "cn=%s,%s,%s", name, container,
 				       ads->config.bind_path)))
 		goto done;
-	if (!(controlstr = talloc_asprintf(ctx, "%u", UF_NORMAL_ACCOUNT)))
+	if (!(controlstr = talloc_asprintf(ctx, "%u", (UF_NORMAL_ACCOUNT | UF_ACCOUNTDISABLE))))
 		goto done;
 	if (!(mods = ads_init_mods(ctx)))
 		goto done;