diff mbox series

[7/9] samba: remove SO_xxxBUF size definitions from default config

Message ID 20201005201711.4259-7-arne_f@ipfire.org
State Accepted
Commit b3e5529459d4dec78aa07b08b4ccfacdc449c3f9
Headers
Series [1/9] samba.cgi: remove unsupported security = share |

Commit Message

Arne Fitzenreiter Oct. 5, 2020, 8:17 p.m. UTC 
  this option is not recommended for samba4

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---
 config/samba/default.global | 2 +-
 html/cgi-bin/samba.cgi      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

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 = 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 151283e7f..d88a2ee47 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';