From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 [PATCH 43/54] samba: Drop choice to enable/disable wide links/UNIX extensions
Date: Tue, 13 Oct 2020 16:08:01 +0000
Message-ID: <20201013160812.27754-43-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1622801557984527031=="
List-Id: <development.lists.ipfire.org>

--===============1622801557984527031==
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 | 38 +++-----------------------------------
 1 file changed, 3 insertions(+), 35 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index d9c5f3f29..f46ab7ee3 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -65,8 +65,6 @@ $sambasettings{'REMOTEANNOUNCE'} =3D '';
 $sambasettings{'REMOTESYNC'} =3D '';
 $sambasettings{'GUESTACCOUNT'} =3D 'samba';
 $sambasettings{'MAPTOGUEST'} =3D 'Bad User';
-$sambasettings{'WIDELINKS'} =3D 'on';
-$sambasettings{'UNIXEXTENSION'} =3D 'off';
 $sambasettings{'ENCRYPTION'} =3D 'optional';
 ### Values that have to be initialized
 $sambasettings{'ACTION'} =3D '';
@@ -77,9 +75,6 @@ my $LOGLINES =3D '50';
 &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
 &Header::getcgihash(\%sambasettings);
=20
-if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'}=
 eq 'on'))
-  {$errormessage =3D "$errormessage<br />Don't enable 'Wide links' and 'Unix=
 extension' at the same time"; }
-
 &Header::openpage('Samba', 1, '');
 &Header::openbigbox('100%', 'left', '', $errormessage);
=20
@@ -115,9 +110,6 @@ if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
 delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambaset=
tings{'y'};
 &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
=20
-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";}
-
 ############################################################################=
################################################
 ############################################# Schreiben der Samba globals ##=
################################################
=20
@@ -134,9 +126,6 @@ workgroup =3D $sambasettings{'WORKGRP'}
 realm =3D $mainsettings{'DOMAINNAME'}
 passdb backend =3D smbpasswd
=20
-wide links =3D $sambasettings{'WIDELINKS'}
-unix extensions =3D $sambasettings{'UNIXEXTENSION'}
-
 map to guest =3D $sambasettings{'MAPTOGUEST'}
=20
 security =3D $sambasettings{'SECURITY'}
@@ -159,6 +148,9 @@ logging =3D syslog
 # Enable support for Apple
 vfs objects =3D catia fruit streams_xattr
=20
+# Enable following symlinks
+wide links =3D yes
+
 END
 ;
=20
@@ -201,12 +193,6 @@ if ($message) {
 ############################################################################=
################################################
 ########################################## Aktivieren von Checkboxen und Dro=
pdowns #########################################
=20
-$checked{'WIDELINKS'}{'off'} =3D '';
-$checked{'WIDELINKS'}{'on'} =3D '';
-$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} =3D "checked=3D'checked'";
-$checked{'UNIXEXTENSION'}{'off'} =3D '';
-$checked{'UNIXEXTENSION'}{'on'} =3D '';
-$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} =3D "checked=3D'c=
hecked'";
 $selected{'ENCRYPTION'}{'optional'} =3D '';
 $selected{'ENCRYPTION'}{'desired'} =3D '';
 $selected{'ENCRYPTION'}{'required'} =3D '';
@@ -292,24 +278,6 @@ print <<END
 				<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 <input type=3D'radio' name=3D'WIDELINKS' value=3D'on' $checked{'WIDE=
LINKS'}{'on'} /> /
-					<input type=3D'radio' name=3D'WIDELINKS' value=3D'off' $checked{'WIDELI=
NKS'}{'off'} /> off
-				</td>
-			</tr>
-			<tr>
-				<td align=3D'left' width=3D'40%'>Unix extension</td>
-				<td align=3D'left'>
-					on <input type=3D'radio' name=3D'UNIXEXTENSION' value=3D'on' $checked{'=
UNIXEXTENSION'}{'on'} /> /
-					<input type=3D'radio' name=3D'UNIXEXTENSION' value=3D'off' $checked{'UN=
IXEXTENSION'}{'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></t=
d>
 			</tr>
--=20
2.20.1


--===============1622801557984527031==--