X-Git-Url: http://git.samba.org/?p=amitay%2Fsamba.git;a=blobdiff_plain;f=source4%2Fdsdb%2Fcommon%2Futil_samr.c;h=3ce8d76018da191bb004596b470cffea6ee78347;hp=83a8c385af601146d50b11d4859bd454c8410895;hb=2993113a56032be89272a626a7ef4c436d73080a;hpb=add8505fde9d178b3a0dbb71a207485cdb8fc161

diff --git a/source4/dsdb/common/util_samr.c b/source4/dsdb/common/util_samr.c
index 83a8c385af6..3ce8d76018d 100644
--- a/source4/dsdb/common/util_samr.c
+++ b/source4/dsdb/common/util_samr.c
@@ -36,6 +36,7 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
 		       TALLOC_CTX *mem_ctx,
 		       const char *account_name,
 		       uint32_t acct_flags,
+		       const struct dom_sid *forced_sid,
 		       struct dom_sid **sid,
 		       struct ldb_dn **dn)
 {
@@ -143,6 +144,18 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
 	ldb_msg_add_string(msg, "sAMAccountName", account_name);
 	ldb_msg_add_string(msg, "objectClass", obj_class);
 
+	/* This is only here for migrations using pdb_samba4, the
+	 * caller and the samldb are responsible for ensuring it makes
+	 * sense */
+	if (forced_sid) {
+		ret = samdb_msg_add_dom_sid(ldb, msg, msg, "objectSID", forced_sid);
+		if (ret != LDB_SUCCESS) {
+			ldb_transaction_cancel(ldb);
+			talloc_free(tmp_ctx);
+			return NT_STATUS_INTERNAL_ERROR;
+		}
+	}
+
 	/* create the user */
 	ret = ldb_add(ldb, msg);
 	switch (ret) {
@@ -244,7 +257,9 @@ NTSTATUS dsdb_add_user(struct ldb_context *ldb,
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 	*dn = talloc_steal(mem_ctx, account_dn);
-	*sid = talloc_steal(mem_ctx, account_sid);
+	if (sid) {
+		*sid = talloc_steal(mem_ctx, account_sid);
+	}
 	talloc_free(tmp_ctx);
 	return NT_STATUS_OK;
 }