sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-07 12:59:08 +03:00
Code Activity

provision: when deriving netbiosname from hostname force the netbiosname to be compliant

Browse Source 
It means no space/_/-/@.... and less than 16 chars.

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sat Oct 30 14:26:22 UTC 2010 on sn-devel-104
This commit is contained in:
Matthieu Patou
2010-10-28 13:09:51 +04:00
committed by Matthieu Patou
parent edebb76a61
commit dc0000e1a8
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source4/scripting/python/samba/provision.py
View File

@ -443,6 +443,11 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
netbiosname = lp.get("netbios name")
if netbiosname is None:
netbiosname = hostname
# remove forbidden chars
for char in " !#$%&'()-.@^_{}~":
netbiosname = "".join(netbiosname.split(char))
#force the length to be <16
netbiosname = netbiosname[0:15]
assert netbiosname is not None
netbiosname = netbiosname.upper()
if not valid_netbios_name(netbiosname):
@ -534,7 +539,14 @@ def make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrole,
assert smbconf is not None
if hostname is None:
hostname = socket.gethostname().split(".")[0]
netbiosname = hostname.upper()
netbiosname = hostname.upper()
# remove forbidden chars
for char in " !#$%&'()-.@^_{}~":
netbiosname = "".join(netbiosname.split(char))
#force the length to be <16
netbiosname = netbiosname[0:15]
else:
netbiosname = hostname.upper()
if serverrole is None:
serverrole = "standalone"
@ -1436,12 +1448,10 @@ def provision(setup_dir, logger, session_info,
lp = samba.param.LoadParm()
lp.load(smbconf)
names = guess_names(lp=lp, hostname=hostname, domain=domain,
dnsdomain=realm, serverrole=serverrole,
domaindn=domaindn, configdn=configdn, schemadn=schemadn,
serverdn=serverdn, sitename=sitename)
paths = provision_paths_from_lp(lp, names.dnsdomain)
paths.bind_gid = bind_gid