From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 12/54] samba: Hard-code server string
Date: Tue, 13 Oct 2020 16:07:30 +0000
Message-ID: <20201013160812.27754-12-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2690836932083805210=="
List-Id: <development.lists.ipfire.org>

--===============2690836932083805210==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index a36f34272..5a97b291d 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -76,7 +76,6 @@ my %servicenames =3D ('SMB Daemon' =3D> 'smbd', 'NetBIOS Na=
meserver' =3D> 'nmbd', 'Win
=20
 $sambasettings{'WORKGRP'} =3D 'homeip.net';
 $sambasettings{'NETBIOSNAME'} =3D 'IPFire';
-$sambasettings{'SRVSTRING'} =3D 'Samba running on IPFire 2.x';
 $sambasettings{'INTERFACES'} =3D '';
 $sambasettings{'SECURITY'} =3D 'user';
 $sambasettings{'OSLEVEL'} =3D '33';
@@ -142,7 +141,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	system("/usr/local/bin/sambactrl smbglobalreset");
 	$sambasettings{'WORKGRP'} =3D 'homeip.net';
 	$sambasettings{'NETBIOSNAME'} =3D 'IPFire';
-	$sambasettings{'SRVSTRING'} =3D 'Samba running on IPFire 2.x';
 	$sambasettings{'INTERFACES'} =3D '';
 	$sambasettings{'SECURITY'} =3D 'user';
 	$sambasettings{'OSLEVEL'} =3D '65';
@@ -263,8 +261,9 @@ print FILE <<END
 # global.settings by IPFire Project
=20
 [global]
+server string =3D Samba on IPFire
+
 netbios name =3D $sambasettings{'NETBIOSNAME'}
-server string =3D $sambasettings{'SRVSTRING'}
 workgroup =3D $sambasettings{'WORKGRP'}
 realm =3D $mainsettings{'DOMAINNAME'}
 passdb backend =3D smbpasswd
@@ -456,7 +455,6 @@ print <<END
 <tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang:=
:tr{'basic options'}</b></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'workgroup'}</td><td align=3D=
'left'><input type=3D'text' name=3D'WORKGRP' value=3D'$sambasettings{'WORKGRP=
'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'netbios name'}</td><td align=
=3D'left'><input type=3D'text' name=3D'NETBIOSNAME' value=3D'$sambasettings{'=
NETBIOSNAME'}' size=3D"30" /></td></tr>
-<tr><td align=3D'left' width=3D'40%'>$Lang::tr{'server string'}</td><td alig=
n=3D'left'><input type=3D'text' name=3D'SRVSTRING' value=3D'$sambasettings{'S=
RVSTRING'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'log level'}</td><td align=3D=
'left'><input type=3D'text' name=3D'LOGLEVEL' value=3D'$sambasettings{'LOGLEV=
EL'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'interfaces'}</td><td align=
=3D'left'>on <input type=3D'radio' name=3D'VPN' value=3D'on' $checked{'VPN'}{=
'on'} />/
 																						<input type=3D'radio' name=3D'VPN' value=3D'off' $chec=
ked{'VPN'}{'off'} /> off |
--=20
2.20.1


--===============2690836932083805210==--