From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 14/54] samba: Remove limitation that server only uses SMB2
Date: Tue, 13 Oct 2020 16:07:32 +0000
Message-ID: <20201013160812.27754-14-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1845210804513205654=="
List-Id: <development.lists.ipfire.org>

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

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 0beb24241..2e0ddc7f2 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -93,7 +93,6 @@ $sambasettings{'MAPTOGUEST'} =3D 'Bad User';
 $sambasettings{'LOGLEVEL'} =3D '3 passdb:5 auth:5 winbind:2';
 $sambasettings{'WIDELINKS'} =3D 'on';
 $sambasettings{'UNIXEXTENSION'} =3D 'off';
-$sambasettings{'SMB2'} =3D 'on';
 ### Values that have to be initialized
 $sambasettings{'ACTION'} =3D '';
 ### Samba CUPS Variablen
@@ -169,7 +168,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'PREFERREDMASTER'} =3D 'off';
 	$sambasettings{'WIDELINKS'} =3D 'on';
 	$sambasettings{'UNIXEXTENSION'} =3D 'off';
-	$sambasettings{'SMB2'} =3D 'on';
 	$PDCOPTIONS =3D `cat ${General::swroot}/samba/pdc`;
 	system("/usr/local/bin/sambactrl smbreload");
 	refreshpage();
@@ -267,14 +265,6 @@ passdb backend =3D smbpasswd
=20
 wide links =3D $sambasettings{'WIDELINKS'}
 unix extensions =3D $sambasettings{'UNIXEXTENSION'}
-END
-;
-
-if ($sambasettings{'SMB2'} eq 'on'){
-	print FILE "max protocol =3D smb2\n";
-}
-
-print FILE <<END
 os level =3D $sambasettings{'OSLEVEL'}
=20
 map to guest =3D $sambasettings{'MAPTOGUEST'}
@@ -394,9 +384,6 @@ $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} =3D "c=
hecked=3D'checked'";
 $checked{'UNIXEXTENSION'}{'off'} =3D '';
 $checked{'UNIXEXTENSION'}{'on'} =3D '';
 $checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} =3D "checked=3D'c=
hecked'";
-$checked{'SMB2'}{'off'} =3D '';
-$checked{'SMB2'}{'on'} =3D '';
-$checked{'SMB2'}{$sambasettings{'SMB2'}} =3D "checked=3D'checked'";
 $checked{'GREEN'}{'off'} =3D '';
 $checked{'GREEN'}{'on'} =3D '';
 $checked{'GREEN'}{$sambasettings{'GREEN'}} =3D "checked=3D'checked'";
@@ -488,8 +475,6 @@ print <<END
 																							<input type=3D'radio' name=3D'WIDELINKS' value=3D'off=
' $checked{'WIDELINKS'}{'off'} /> off</td></tr>
 <tr><td align=3D'left' width=3D'40%'>Unix extension</td><td align=3D'left'>o=
n <input type=3D'radio' name=3D'UNIXEXTENSION' value=3D'on' $checked{'UNIXEXT=
ENSION'}{'on'} />/
 																							<input type=3D'radio' name=3D'UNIXEXTENSION' value=3D=
'off' $checked{'UNIXEXTENSION'}{'off'} /> off</td></tr>
-<tr><td align=3D'left' width=3D'40%'>SMB2 $Lang::tr{'protocol'}</td><td alig=
n=3D'left'>on <input type=3D'radio' name=3D'SMB2' value=3D'on' $checked{'SMB2=
'}{'on'} />/
-																							<input type=3D'radio' name=3D'SMB2' value=3D'off' $ch=
ecked{'SMB2'}{'off'} /> off</td></tr>
 <tr><td align=3D'left'><br /></td><td></td></tr>
 <tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang:=
:tr{'security options'}</b></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'security'}</td><td align=3D'=
left'><select name=3D'SECURITY' style=3D"width: 165px">
--=20
2.20.1


--===============1845210804513205654==--