From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 03/54] samba: Remove deprecated syslog options
Date: Tue, 13 Oct 2020 16:07:21 +0000
Message-ID: <20201013160812.27754-3-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7136199698188432905=="
List-Id: <development.lists.ipfire.org>

--===============7136199698188432905==
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    | 13 -------------
 src/paks/samba/install.sh |  1 +
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index d88a2ee47..4e6cd45e4 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{'SYSLOGLEVEL'} =3D '1';
-$sambasettings{'SYSLOGONLY'} =3D 'on';
 $sambasettings{'DOSCHARSET'} =3D 'CP850';
 $sambasettings{'UNIXCHARSET'} =3D 'UTF8';
 $sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_KEEPALIVE';
@@ -164,8 +162,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{'SYSLOGLEVEL'} =3D '1';
-	$sambasettings{'SYSLOGONLY'} =3D 'on';
 	$sambasettings{'DOSCHARSET'} =3D 'CP850';
 	$sambasettings{'UNIXCHARSET'} =3D 'UTF8';
 ### Samba CUPS Variablen
@@ -260,7 +256,6 @@ if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasetting=
s{'WINSSUPPORT'} =3D "tru
 if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} =
=3D "true";} else { $sambasettings{'LOCALMASTER'} =3D "false";}
 if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} =
=3D "true";} else { $sambasettings{'DOMAINMASTER'} =3D "false";}
 if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMAS=
TER'} =3D "true";} else { $sambasettings{'PREFERREDMASTER'} =3D "false";}
-if ($sambasettings{'SYSLOGONLY'} eq 'on'){ $sambasettings{'SYSLOGONLY'} =3D =
"yes";} else { $sambasettings{'SYSLOGONLY'} =3D "no";}
 if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} =3D "y=
es";} else { $sambasettings{'WIDELINKS'} =3D "no";}
 if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'=
} =3D "yes";} else { $sambasettings{'UNIXEXTENSION'} =3D "no";}
=20
@@ -324,8 +319,6 @@ winbind use default domain =3D yes
 log file       =3D /var/log/samba/samba-log.%m
 pid directory  =3D /var/run/
 log level =3D $sambasettings{'LOGLEVEL'}
-syslog =3D $sambasettings{'SYSLOGLEVEL'}
-syslog only =3D $sambasettings{'SYSLOGONLY'}
=20
 preferred master =3D $sambasettings{'PREFERREDMASTER'}
 domain master =3D $sambasettings{'DOMAINMASTER'}
@@ -401,9 +394,6 @@ if ($message) {
 ############################################################################=
################################################
 ########################################## Aktivieren von Checkboxen und Dro=
pdowns #########################################
=20
-$checked{'SYSLOGONLY'}{'off'} =3D '';
-$checked{'SYSLOGONLY'}{'on'} =3D '';
-$checked{'SYSLOGONLY'}{$sambasettings{'SYSLOGONLY'}} =3D "checked=3D'checked=
'";
 $checked{'WINSSUPPORT'}{'off'} =3D '';
 $checked{'WINSSUPPORT'}{'on'} =3D '';
 $checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} =3D "checked=3D'check=
ed'";
@@ -487,9 +477,6 @@ print <<END
 <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%'>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>
-<tr><td align=3D'left' width=3D'40%'>Syslog only</td><td align=3D'left'>on <=
input type=3D'radio' name=3D'SYSLOGONLY' value=3D'on' $checked{'SYSLOGONLY'}{=
'on'} />/
-																							<input type=3D'radio' name=3D'SYSLOGONLY' value=3D'of=
f' $checked{'SYSLOGONLY'}{'off'} /> off</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 |
 																						<font size=3D'2' color=3D'$Header::colourovpn'><b>   O=
penVpn  -  $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1]</b></f=
ont></td></tr>
diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index 55525d08a..7d360176a 100644
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -36,6 +36,7 @@ restore_backup ${NAME}
 # Migrate configuration from Samba 3.6 to 4.x
 sed -i /var/ipfire/samba/smb.conf \
 	-e "/^display charset =3D/d" \
+	-e "/^syslog/d" \
 	-e "s/^security =3D share$/security =3D user/"
=20
 # Start the service
--=20
2.20.1


--===============7136199698188432905==--