From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 11/54] samba: Drop outdated character set settings
Date: Tue, 13 Oct 2020 16:07:29 +0000
Message-ID: <20201013160812.27754-11-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0860694409629772373=="
List-Id: <development.lists.ipfire.org>

--===============0860694409629772373==
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 | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 07665e8f1..a36f34272 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -93,8 +93,6 @@ $sambasettings{'OTHERINTERFACES'} =3D '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} =3D 'samba';
 $sambasettings{'MAPTOGUEST'} =3D 'Bad User';
 $sambasettings{'LOGLEVEL'} =3D '3 passdb:5 auth:5 winbind:2';
-$sambasettings{'DOSCHARSET'} =3D 'CP850';
-$sambasettings{'UNIXCHARSET'} =3D 'UTF8';
 $sambasettings{'WIDELINKS'} =3D 'on';
 $sambasettings{'UNIXEXTENSION'} =3D 'off';
 $sambasettings{'SMB2'} =3D 'on';
@@ -161,8 +159,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'GUESTACCOUNT'} =3D 'samba';
 	$sambasettings{'MAPTOGUEST'} =3D 'Bad User';
 	$sambasettings{'LOGLEVEL'} =3D '3 passdb:5 auth:5 winbind:2';
-	$sambasettings{'DOSCHARSET'} =3D 'CP850';
-	$sambasettings{'UNIXCHARSET'} =3D 'UTF8';
 ### Samba CUPS Variablen
 	$sambasettings{'LOADPRINTERS'} =3D 'Yes';
 	$sambasettings{'PRINTING'} =3D 'cups';
@@ -286,8 +282,6 @@ print FILE <<END
 os level =3D $sambasettings{'OSLEVEL'}
=20
 map to guest =3D $sambasettings{'MAPTOGUEST'}
-dos charset =3D $sambasettings{'DOSCHARSET'}
-unix charset =3D $sambasettings{'UNIXCHARSET'}
=20
 security =3D $sambasettings{'SECURITY'}
 guest account =3D $sambasettings{'GUESTACCOUNT'}
@@ -462,8 +456,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{'dos charset'}</td><td align=
=3D'left'><input type=3D'text' name=3D'DOSCHARSET' value=3D'$sambasettings{'D=
OSCHARSET'}' size=3D"30" /></td></tr>
-<tr><td align=3D'left' width=3D'40%'>$Lang::tr{'unix charset'}</td><td align=
=3D'left'><input type=3D'text' name=3D'UNIXCHARSET' value=3D'$sambasettings{'=
UNIXCHARSET'}' 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'} />/
--=20
2.20.1


--===============0860694409629772373==--