summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-08-11 15:45:43 +1000
committerAndrew Tridgell <tridge@samba.org>2011-08-12 04:00:07 +0200
commitd79ee18f988d1f43eb1f76752e749385b9b9c251 (patch)
treef3a92d546240b7a320b299f195aa4b6d28c69040
parentccba16c4b8de285f55683011c1527af3f6f48460 (diff)
downloadsamba-d79ee18f988d1f43eb1f76752e749385b9b9c251.tar.gz
samba-d79ee18f988d1f43eb1f76752e749385b9b9c251.tar.bz2
samba-d79ee18f988d1f43eb1f76752e749385b9b9c251.zip
s4-provision: create dsServiceName in @ROOTDSE in GUID form
this allows for handling of server renames as the GUID doesn't change Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/scripting/python/samba/provision/__init__.py3
-rw-r--r--source4/setup/provision_rootdse_modify.ldif2
2 files changed, 4 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index 4724afed1f..17f8e0f15b 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -1745,7 +1745,8 @@ def provision(logger, session_info, credentials, smbconf=None,
domainsid, names.dnsdomain, names.domaindn, lp)
logger.info("Setting up sam.ldb rootDSE marking as synchronized")
- setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"))
+ setup_modify_ldif(samdb, setup_path("provision_rootdse_modify.ldif"),
+ { 'NTDSGUID' : names.ntdsguid })
secretsdb_self_join(secrets_ldb, domain=names.domain,
realm=names.realm, dnsdomain=names.dnsdomain,
diff --git a/source4/setup/provision_rootdse_modify.ldif b/source4/setup/provision_rootdse_modify.ldif
index 1f950171a2..f6b803b3c9 100644
--- a/source4/setup/provision_rootdse_modify.ldif
+++ b/source4/setup/provision_rootdse_modify.ldif
@@ -3,3 +3,5 @@ dn: @ROOTDSE
changetype: modify
replace: isSynchronized
isSynchronized: TRUE
+replace: dsServiceName
+dsServiceName: <GUID=${NTDSGUID}>