From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 26 Feb 2012 19:40:26 +0000 (+0100)
Subject: provision: Reuse determine_netbios_name.
X-Git-Tag: tdb-1.2.10~605
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=171dc5ad4f10bca0038653f770decc72b872220d;p=thirdparty%2Fsamba.git

provision: Reuse determine_netbios_name.
---

diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py
index f28fe5b4f95..e627c86a50c 100644
--- a/source4/scripting/python/samba/provision/__init__.py
+++ b/source4/scripting/python/samba/provision/__init__.py
@@ -599,14 +599,7 @@ def make_smbconf(smbconf, hostname, domain, realm, serverrole,
     assert smbconf is not None
     if hostname is None:
         hostname = socket.gethostname().split(".")[0]
-        netbiosname = hostname.upper()
-        # remove forbidden chars
-        newnbname = ""
-        for x in netbiosname:
-            if x.isalnum() or x in VALID_NETBIOS_CHARS:
-                newnbname = "%s%c" % (newnbname, x)
-        #force the length to be <16
-        netbiosname = newnbname[0:15]
+        netbiosname = determine_netbios_name(hostname)
     else:
         netbiosname = hostname.upper()