From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 5 Oct 2020 20:17:09 +0000 (+0200)
Subject: samba: remove SO_xxxBUF size definitions from default config
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3e5529459d4dec78aa07b08b4ccfacdc449c3f9;p=people%2Fms%2Fipfire-2.x.git

samba: remove SO_xxxBUF size definitions from default config

this option is not recommended for samba4

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/samba/default.global b/config/samba/default.global
index 73a0ffa3c9..5a6a81729e 100644
--- a/config/samba/default.global
+++ b/config/samba/default.global
@@ -23,7 +23,7 @@ null passwords = yes
 
 bind interfaces only = true
 interfaces =  green0 127.0.0.1
-socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
+socket options = TCP_NODELAY SO_KEEPALIVE
 
 username level = 1
 wins support = true
diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 151283e7f0..d88a2ee47a 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -97,7 +97,7 @@ $sambasettings{'SYSLOGLEVEL'} = '1';
 $sambasettings{'SYSLOGONLY'} = 'on';
 $sambasettings{'DOSCHARSET'} = 'CP850';
 $sambasettings{'UNIXCHARSET'} = 'UTF8';
-$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
+$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE';
 $sambasettings{'WIDELINKS'} = 'on';
 $sambasettings{'UNIXEXTENSION'} = 'off';
 $sambasettings{'SMB2'} = 'on';
@@ -180,7 +180,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
 	$sambasettings{'LOCALMASTER'} = 'off';
 	$sambasettings{'DOMAINMASTER'} = 'off';
 	$sambasettings{'PREFERREDMASTER'} = 'off';
-	$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
+	$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE';
 	$sambasettings{'WIDELINKS'} = 'on';
 	$sambasettings{'UNIXEXTENSION'} = 'off';
 	$sambasettings{'SMB2'} = 'on';