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

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

It is virtually impossible to limit samba to these interfaces only.

Therefore we add a static list of all interfaces of the local network.

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

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 78efc5175..902ae6eac 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -184,7 +184,7 @@ guest account =3D $sambasettings{'GUESTACCOUNT'}
 unix password sync =3D $sambasettings{'PASSWORDSYNC'}
=20
 bind interfaces only =3D true
-interfaces =3D $sambasettings{'INTERFACES'}
+interfaces =3D green0 blue0 127.0.0.0/8
 remote announce =3D $sambasettings{'REMOTEANNOUNCE'}
 remote browse sync =3D $sambasettings{'REMOTESYNC'}
=20
@@ -336,37 +336,7 @@ print <<END
 <table width=3D'95%' cellspacing=3D'0'>
 <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{'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>
-<tr><td align=3D'left' width=3D'40%'></td><td align=3D'left'>on <input type=
=3D'radio' name=3D'GREEN' value=3D'on' $checked{'GREEN'}{'on'} />/
-																	<input type=3D'radio' name=3D'GREEN' value=3D'off' $checked=
{'GREEN'}{'off'} /> off |
-																	<font size=3D'2' color=3D'$Header::colourgreen'><b>   $Lang=
::tr{'green'}  -  $netsettings{'GREEN_DEV'}</b></font></td></tr>
-END
-;
-
-if (&Header::blue_used())
-	{
-	print <<END
-	<tr><td align=3D'left' width=3D'40%'></td><td align=3D'left'>on <input type=
=3D'radio' name=3D'BLUE' value=3D'on' $checked{'BLUE'}{'on'} />/
-																		<input type=3D'radio' name=3D'BLUE' value=3D'off' $checked=
{'BLUE'}{'off'} /> off |
-																		<font size=3D'2' color=3D'$Header::colourblue'><b>   $Lang=
::tr{'wireless'}  -  $netsettings{'BLUE_DEV'}</b></font></td></tr>
-END
-;
-	}
-
-if (&Header::orange_used())
-	{
-	print <<END
-	<tr><td align=3D'left' width=3D'40%'></td><td align=3D'left'>on <input type=
=3D'radio' name=3D'ORANGE' value=3D'on' $checked{'ORANGE'}{'on'} />/
-																		<input type=3D'radio' name=3D'ORANGE' value=3D'off' $check=
ed{'ORANGE'}{'off'} /> off |
-																		<font size=3D'2' color=3D'$Header::colourorange'><b>   $La=
ng::tr{'dmz'}  -  $netsettings{'ORANGE_DEV'}</b></font></td></tr>
-END
-;
-	}
-
 print <<END
-<tr><td align=3D'center' width=3D'40%'>$Lang::tr{'more'}</td><td align=3D'le=
ft'><input type=3D'text' name=3D'OTHERINTERFACES' value=3D'$sambasettings{'OT=
HERINTERFACES'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left'><br /></td><td></td></tr>
 <tr><td align=3D'left' width=3D'40%'>Wide links</td><td align=3D'left'>on <i=
nput type=3D'radio' name=3D'WIDELINKS' value=3D'on' $checked{'WIDELINKS'}{'on=
'} />/
 																							<input type=3D'radio' name=3D'WIDELINKS' value=3D'off=
' $checked{'WIDELINKS'}{'off'} /> off</td></tr>
--=20
2.20.1


--===============3479998745687747216==--