From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/9] samba.cgi: remove unsupported DISPLAY CHARSET
Date: Mon, 05 Oct 2020 22:17:04 +0200
Message-ID: <20201005201711.4259-2-arne_f@ipfire.org>
In-Reply-To: <20201005201711.4259-1-arne_f@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1417603276753063605=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
 html/cgi-bin/samba.cgi | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 8f88bc728..151283e7f 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -97,7 +97,6 @@ $sambasettings{'SYSLOGLEVEL'} =3D '1';
 $sambasettings{'SYSLOGONLY'} =3D 'on';
 $sambasettings{'DOSCHARSET'} =3D 'CP850';
 $sambasettings{'UNIXCHARSET'} =3D 'UTF8';
-$sambasettings{'DISPLAYCHARSET'} =3D 'CP850';
 $sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_RCVBUF=3D819200 SO_SNDBU=
F=3D819200 SO_KEEPALIVE';
 $sambasettings{'WIDELINKS'} =3D 'on';
 $sambasettings{'UNIXEXTENSION'} =3D 'off';
@@ -169,7 +168,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'SYSLOGONLY'} =3D 'on';
 	$sambasettings{'DOSCHARSET'} =3D 'CP850';
 	$sambasettings{'UNIXCHARSET'} =3D 'UTF8';
-	$sambasettings{'DISPLAYCHARSET'} =3D 'CP850';
 ### Samba CUPS Variablen
 	$sambasettings{'LOADPRINTERS'} =3D 'Yes';
 	$sambasettings{'PRINTING'} =3D 'cups';
@@ -301,7 +299,6 @@ map to guest =3D $sambasettings{'MAPTOGUEST'}
 smb ports =3D 445 139
 dos charset =3D $sambasettings{'DOSCHARSET'}
 unix charset =3D $sambasettings{'UNIXCHARSET'}
-display charset =3D $sambasettings{'DISPLAYCHARSET'}
=20
 security =3D $sambasettings{'SECURITY'}
 encrypt passwords =3D yes
@@ -488,7 +485,6 @@ print <<END
 <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{'display charset'}</td><td al=
ign=3D'left'><input type=3D'text' name=3D'DISPLAYCHARSET' value=3D'$sambasett=
ings{'DISPLAYCHARSET'}' 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%'>Sys$Lang::tr{'log level'}</td><td align=
=3D'left'><input type=3D'text' name=3D'SYSLOGLEVEL' value=3D'$sambasettings{'=
SYSLOGLEVEL'}' size=3D"30" /></td></tr>
--=20
2.17.1


--===============1417603276753063605==--