Revert "s4:util_samr.c - also here we've now the default primaryGroupID detection...

This reverts commit 7e9e35db4126f953e8a2579d992c63b274011119.

Sorry, the logic is working differently here. We do still need this.

diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index 02f31bf305531ba45b0c53dc5fb99dc63c4f2d20..3a6be10a883ed55860f96b8008a12ccd84ce471a 100644 (file)
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -115,6 +115,8 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
                cn_name[cn_name_len - 1] = '\0';
                container = "CN=Computers";
                obj_class = "computer";
+               samdb_msg_add_uint(ldb, tmp_ctx, msg,
+                       "primaryGroupID", DOMAIN_RID_DOMAIN_MEMBERS);
 
        } else if (acct_flags == ACB_SVRTRUST) {
                if (cn_name[cn_name_len - 1] != '$') {
@@ -124,7 +126,8 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
                cn_name[cn_name_len - 1] = '\0';
                container = "OU=Domain Controllers";
                obj_class = "computer";
-
+               samdb_msg_add_uint(ldb, tmp_ctx, msg,
+                       "primaryGroupID", DOMAIN_RID_DCS);
        } else {
                ldb_transaction_cancel(ldb);
                talloc_free(tmp_ctx);