From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Oct 2020 20:50:45 +0000 (+0100)
Subject: samba: Drop netbios name option
X-Git-Tag: v2.25-core152~7^2~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=240b8048ad489d7d67dcb49a2f150e733ebffaf7;p=ipfire-2.x.git

samba: Drop netbios name option

It makes no sense that the same server has different host names

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 5a97b291d2..0beb24241d 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -75,7 +75,6 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win
 #################################### Initialisierung von Samba Variablen fr global Settings ###############################
 
 $sambasettings{'WORKGRP'} = 'homeip.net';
-$sambasettings{'NETBIOSNAME'} = 'IPFire';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'user';
 $sambasettings{'OSLEVEL'} = '33';
@@ -140,7 +139,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	{
 	system("/usr/local/bin/sambactrl smbglobalreset");
 	$sambasettings{'WORKGRP'} = 'homeip.net';
-	$sambasettings{'NETBIOSNAME'} = 'IPFire';
 	$sambasettings{'INTERFACES'} = '';
 	$sambasettings{'SECURITY'} = 'user';
 	$sambasettings{'OSLEVEL'} = '65';
@@ -263,7 +261,6 @@ print FILE <<END
 [global]
 server string = Samba on IPFire
 
-netbios name = $sambasettings{'NETBIOSNAME'}
 workgroup = $sambasettings{'WORKGRP'}
 realm = $mainsettings{'DOMAINNAME'}
 passdb backend = smbpasswd
@@ -454,7 +451,6 @@ print <<END
 <table width='95%' cellspacing='0'>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'log level'}</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'interfaces'}</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
 																						<input type='radio' name='VPN' value='off' $checked{'VPN'}{'off'} /> off |