From: Matthias Dieter Wallnöfer <mdw@samba.org>
Date: Sun, 12 Sep 2010 16:26:06 +0000 (+0200)
Subject: s4:samldb LDB module - "samldb_check_primaryGroupID" - support RID derivation from... 
X-Git-Tag: samba-4.0.0alpha13~212
X-Git-Url: http://git.samba.org/samba.git/?p=samba.git;a=commitdiff_plain;h=7f424155e62d04d23bb1c825ecd546eed18725e0

s4:samldb LDB module - "samldb_check_primaryGroupID" - support RID derivation from "userAccountControl"

Specified in MS-SAMR 3.1.1.8.1 and probably fixes also bug #7441.
---

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 85038314ba0..7fa27e8a91f 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -259,7 +259,11 @@ static int samldb_check_primaryGroupID(struct samldb_ctx *ac)
 
 	rid = samdb_result_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
 	if (rid == (uint32_t) -1) {
-		rid = DOMAIN_RID_USERS;
+		uint32_t uac = samdb_result_uint(ac->msg, "userAccountControl",
+						 0);
+
+		rid = ds_uf2prim_group_rid(uac);
+
 		ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
 					 "primaryGroupID", rid);
 		if (ret != LDB_SUCCESS) {