diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2010-09-16 16:58:18 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-09-24 09:25:42 +1000 |
| commit | 439d7ff935f845ae381e8650e7e2b80d65e929d2 (patch) | |
| tree | 0ea0c0638556be9c900536e3aa8825af8051d705 | |
| parent | 679eb33e798efbfdaebb9cf0cd3977bb945e8075 (diff) | |
| download | samba-439d7ff935f845ae381e8650e7e2b80d65e929d2.tar.gz samba-439d7ff935f845ae381e8650e7e2b80d65e929d2.tar.bz2 samba-439d7ff935f845ae381e8650e7e2b80d65e929d2.zip | |
s4:provision.py - make more use of "names.serverdn" on NTDS settings location
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/provision.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index 6429251850..6c2d0f1115 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -922,7 +922,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=%s,CN=Sites,CN=Configuration,%s" % (names.hostname, names.sitename, names.domaindn) + ntds_dn = "CN=NTDS Settings,%s" % names.serverdn names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE) assert isinstance(names.ntdsguid, str) @@ -1201,7 +1201,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=%s,CN=Sites,CN=Configuration,%s" % (names.hostname, names.sitename, names.domaindn) + ntds_dn = "CN=NTDS Settings,%s" % names.serverdn names.ntdsguid = samdb.searchone(basedn=ntds_dn, attribute="objectGUID", expression="", scope=ldb.SCOPE_BASE) assert isinstance(names.ntdsguid, str) |