diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-02-26 20:40:26 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-02-26 20:52:05 +0100 |
| commit | 171dc5ad4f10bca0038653f770decc72b872220d (patch) | |
| tree | ad3a6a136c4ba3be6cc7241a4981a0468c99c448 /source4/scripting | |
| parent | 3b738a5914765afad2be30ba3f7db11170e87012 (diff) | |
| download | samba-171dc5ad4f10bca0038653f770decc72b872220d.tar.gz samba-171dc5ad4f10bca0038653f770decc72b872220d.tar.bz2 samba-171dc5ad4f10bca0038653f770decc72b872220d.zip | |
provision: Reuse determine_netbios_name.
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/samba/provision/__init__.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source4/scripting/python/samba/provision/__init__.py b/source4/scripting/python/samba/provision/__init__.py index f28fe5b4f9..e627c86a50 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() |