From cadca1f6ba514eb7b022d761935f80b3049cede4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 30 Apr 2010 18:47:44 +0200 Subject: s4:provision: don't use hardcoded 'Default-First-Site-Name' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit metze Signed-off-by: Matthias Dieter Wallnöfer --- source4/scripting/python/samba/provision.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index bfa1b952d4..ec8dc100ef 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -799,7 +799,7 @@ def setup_self_join(samdb, names, "DOMAINDN": names.domaindn}) # add the NTDSGUID based SPNs - ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s" % (names.hostname, names.domaindn) + ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=%s,CN=Sites,CN=Configuration,%s" % (names.hostname, names.sitename, names.domaindn) names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE) assert isinstance(names.ntdsguid, str) @@ -1035,7 +1035,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, names, domainControllerFunctionality=domainControllerFunctionality, ntdsguid=ntdsguid) - ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,%s" % (names.hostname, names.domaindn) + ntds_dn = "CN=NTDS Settings,CN=%s,CN=Servers,CN=%s,CN=Sites,CN=Configuration,%s" % (names.hostname, names.sitename, names.domaindn) names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE) assert isinstance(names.ntdsguid, str) -- cgit