python: Make use of ‘serverdn’ parameter

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 57908a141f91acbaa89b749c69e918266bac6bb7..3eac71a8c67d638fb8c676569fb8f8728038d8b5 100644 (file)
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -686,6 +686,10 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
     if sitename is None:
         sitename = DEFAULTSITE
 
+    if serverdn is None:
+        serverdn = "CN=%s,CN=Servers,CN=%s,CN=Sites,%s" % (
+            netbiosname, sitename, configdn)
+
     names = ProvisionNames()
     names.rootdn = rootdn
     names.domaindn = domaindn
@@ -698,8 +702,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
     names.netbiosname = netbiosname
     names.hostname = hostname
     names.sitename = sitename
-    names.serverdn = "CN=%s,CN=Servers,CN=%s,CN=Sites,%s" % (
-        netbiosname, sitename, configdn)
+    names.serverdn = serverdn
 
     return names