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

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

It is not useful to set this on a modern server. The Linux
kernel will be tuning any send and receive buffer sizes.

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi    | 4 ----
 src/paks/samba/install.sh | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 4e6cd45e4..72bf8c469 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -95,7 +95,6 @@ $sambasettings{'MAPTOGUEST'} =3D 'Bad User';
 $sambasettings{'LOGLEVEL'} =3D '3 passdb:5 auth:5 winbind:2';
 $sambasettings{'DOSCHARSET'} =3D 'CP850';
 $sambasettings{'UNIXCHARSET'} =3D 'UTF8';
-$sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_KEEPALIVE';
 $sambasettings{'WIDELINKS'} =3D 'on';
 $sambasettings{'UNIXEXTENSION'} =3D 'off';
 $sambasettings{'SMB2'} =3D 'on';
@@ -176,7 +175,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'LOCALMASTER'} =3D 'off';
 	$sambasettings{'DOMAINMASTER'} =3D 'off';
 	$sambasettings{'PREFERREDMASTER'} =3D 'off';
-	$sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_KEEPALIVE';
 	$sambasettings{'WIDELINKS'} =3D 'on';
 	$sambasettings{'UNIXEXTENSION'} =3D 'off';
 	$sambasettings{'SMB2'} =3D 'on';
@@ -303,7 +301,6 @@ null passwords =3D yes
=20
 bind interfaces only =3D true
 interfaces =3D $sambasettings{'INTERFACES'}
-socket options =3D $sambasettings{'SOCKETOPTIONS'}
 remote announce =3D $sambasettings{'REMOTEANNOUNCE'}
 remote browse sync =3D $sambasettings{'REMOTESYNC'}
=20
@@ -535,7 +532,6 @@ print <<END
 <tr><td align=3D'left'><br /></td><td /></tr>
 <tr bgcolor=3D'$color{'color20'}'><td colspan=3D'2' align=3D'left'><b>$Lang:=
:tr{'network options'}</b></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'os level'}</td><td align=3D'=
left'><input type=3D'text' name=3D'OSLEVEL' value=3D'$sambasettings{'OSLEVEL'=
}' size=3D"30" /></td></tr>
-<tr><td align=3D'left' width=3D'40%'>$Lang::tr{'socket options'}</td><td ali=
gn=3D'left'><input type=3D'text' name=3D'SOCKETOPTIONS' value=3D'$sambasettin=
gs{'SOCKETOPTIONS'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'remote announce'}</td><td al=
ign=3D'left'><input type=3D'text' name=3D'REMOTEANNOUNCE' value=3D'$sambasett=
ings{'REMOTEANNOUNCE'}' size=3D"30" /></td></tr>
 <tr><td align=3D'left' width=3D'40%'>$Lang::tr{'remote browse sync'}</td><td=
 align=3D'left'><input type=3D'text' name=3D'REMOTESYNC' value=3D'$sambasetti=
ngs{'REMOTESYNC'}' size=3D"30" /></td></tr>
 END
diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index 7d360176a..7b81be7c1 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 "/^socket options =3D/d" \
 	-e "/^syslog/d" \
 	-e "s/^security =3D share$/security =3D user/"
=20
--=20
2.20.1


--===============6729801486403939125==--