From: David Mulder Date: Wed, 26 Aug 2020 20:33:13 +0000 (-0600) Subject: samba-tool: Provision search DnsAdmins from wellknown container X-Git-Tag: tevent-0.11.0~243 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db57db80a59e2ecfb1c626f66a72987d9fedcef;p=thirdparty%2Fsamba.git samba-tool: Provision search DnsAdmins from wellknown container BUG: https://bugzilla.samba.org/show_bug.cgi?id=9143 Signed-off-by: David Mulder Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index cd8df680749..6823f9ee56b 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -38,7 +38,8 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2003, DS_DOMAIN_FUNCTION_2008_R2, DS_DOMAIN_FUNCTION_2012_R2, - DS_DOMAIN_FUNCTION_2016 + DS_DOMAIN_FUNCTION_2016, + DS_GUID_USERS_CONTAINER ) from samba.descriptor import ( get_domain_descriptor, @@ -69,8 +70,9 @@ def get_domainguid(samdb, domaindn): def get_dnsadmins_sid(samdb, domaindn): - res = samdb.search(base="CN=DnsAdmins,CN=Users,%s" % domaindn, scope=ldb.SCOPE_BASE, - attrs=["objectSid"]) + base_dn = "CN=DnsAdmins,%s" % samdb.get_wellknown_dn(ldb.Dn(samdb, + domaindn), DS_GUID_USERS_CONTAINER) + res = samdb.search(base=base_dn, scope=ldb.SCOPE_BASE, attrs=["objectSid"]) dnsadmins_sid = ndr_unpack(security.dom_sid, res[0]["objectSid"][0]) return dnsadmins_sid