From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 30 Nov 2023 04:01:11 +0000 (+1300)
Subject: python: Make use of ‘serverdn’ parameter
X-Git-Tag: talloc-2.4.2~328
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9b22c6d5e01452372f541e4bd60397f4cf5caaa;p=thirdparty%2Fsamba.git

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 57908a141f9..3eac71a8c67 100644
--- 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