From: Volker Lendecke <vl@samba.org>
Date: Sat, 19 Feb 2011 16:52:50 +0000 (+0100)
Subject: s3: Add ACB_NORMAL to workstations, match RPC-SAMR
X-Git-Tag: tevent-0.9.11~477
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5f953b1ef82ee280d58bc41a125d3e51cc26f38c;p=thirdparty%2Fsamba.git

s3: Add ACB_NORMAL to workstations, match RPC-SAMR
---

diff --git a/source3/passdb/pdb_ads.c b/source3/passdb/pdb_ads.c
index 0dc39fd308d..51aac2cd7a7 100644
--- a/source3/passdb/pdb_ads.c
+++ b/source3/passdb/pdb_ads.c
@@ -1966,7 +1966,15 @@ static bool pdb_ads_search_filter(struct pdb_methods *m,
 			continue;
 		}
 		sid_peek_rid(&sid, &e->rid);
-		e->acct_flags = ACB_NORMAL;
+
+		if (tldap_pull_uint32(users[i], "userAccountControl", &ctrl)) {
+			e->acct_flags = ds_uf2acb(ctrl);
+			if (e->acct_flags & (ACB_WSTRUST|ACB_SVRTRUST)) {
+				e->acct_flags |= ACB_NORMAL;
+			}
+		} else {
+			e->acct_flags = ACB_NORMAL;
+		}
 
 		if (e->rid == DOMAIN_RID_GUEST) {
 			/*