summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2010-04-30 18:47:44 +0200
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-06-19 21:32:43 +0200
commitcadca1f6ba514eb7b022d761935f80b3049cede4 (patch)
treec8e7154d86f337bc72beef90da32bffe9f53e1ad /source4
parent131be8da0fa2db11b91cb08a182a524832db1d41 (diff)
downloadsamba-cadca1f6ba514eb7b022d761935f80b3049cede4.tar.gz
samba-cadca1f6ba514eb7b022d761935f80b3049cede4.tar.bz2
samba-cadca1f6ba514eb7b022d761935f80b3049cede4.zip
s4:provision: don't use hardcoded 'Default-First-Site-Name'
metze Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/scripting/python/samba/provision.py4
1 files 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)