From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH 7/9] samba: remove SO_xxxBUF size definitions from default config Date: Mon, 05 Oct 2020 22:17:09 +0200 Message-ID: <20201005201711.4259-7-arne_f@ipfire.org> In-Reply-To: <20201005201711.4259-1-arne_f@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6898544674318189538==" List-Id: --===============6898544674318189538== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable this option is not recommended for samba4 Signed-off-by: Arne Fitzenreiter --- config/samba/default.global | 2 +- html/cgi-bin/samba.cgi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/samba/default.global b/config/samba/default.global index 73a0ffa3c..5a6a81729 100644 --- a/config/samba/default.global +++ b/config/samba/default.global @@ -23,7 +23,7 @@ null passwords =3D yes =20 bind interfaces only =3D true interfaces =3D green0 127.0.0.1 -socket options =3D TCP_NODELAY SO_RCVBUF=3D8192 SO_SNDBUF=3D8192 SO_KEEPALIVE +socket options =3D TCP_NODELAY SO_KEEPALIVE =20 username level =3D 1 wins support =3D true diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 151283e7f..d88a2ee47 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -97,7 +97,7 @@ $sambasettings{'SYSLOGLEVEL'} =3D '1'; $sambasettings{'SYSLOGONLY'} =3D 'on'; $sambasettings{'DOSCHARSET'} =3D 'CP850'; $sambasettings{'UNIXCHARSET'} =3D 'UTF8'; -$sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_RCVBUF=3D819200 SO_SNDBU= F=3D819200 SO_KEEPALIVE'; +$sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} =3D 'on'; $sambasettings{'UNIXEXTENSION'} =3D 'off'; $sambasettings{'SMB2'} =3D 'on'; @@ -180,7 +180,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'LOCALMASTER'} =3D 'off'; $sambasettings{'DOMAINMASTER'} =3D 'off'; $sambasettings{'PREFERREDMASTER'} =3D 'off'; - $sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_RCVBUF=3D819200 SO_SNDB= UF=3D819200 SO_KEEPALIVE'; + $sambasettings{'SOCKETOPTIONS'} =3D 'TCP_NODELAY SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} =3D 'on'; $sambasettings{'UNIXEXTENSION'} =3D 'off'; $sambasettings{'SMB2'} =3D 'on'; --=20 2.17.1 --===============6898544674318189538==--