From: David Mulder <dmulder@suse.com>
Date: Tue, 25 Aug 2020 18:44:02 +0000 (-0600)
Subject: samdb: Create user in wellknown user container
X-Git-Tag: tevent-0.11.0~247
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=43ab8a4a1b4152ae86e3dad23f10b40d4f61fb89;p=thirdparty%2Fsamba.git

samdb: Create user in wellknown user container

BUG: https://bugzilla.samba.org/show_bug.cgi?id=9143
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index 424d6d2e88a..2374505575b 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -530,7 +530,12 @@ member: %s
         if useusernameascn is None and displayname != "":
             cn = displayname
 
-        user_dn = "CN=%s,%s,%s" % (cn, (userou or "CN=Users"), self.domain_dn())
+        if userou:
+            user_dn = "CN=%s,%s,%s" % (cn, userou, self.domain_dn())
+        else:
+            user_dn = "CN=%s,%s" % (cn, self.get_wellknown_dn(
+                                        self.get_default_basedn(),
+                                        dsdb.DS_GUID_USERS_CONTAINER))
 
         dnsdomain = ldb.Dn(self, self.domain_dn()).canonical_str().replace("/", "")
         user_principal_name = "%s@%s" % (username, dnsdomain)