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@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'} = 'Bad User'; $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; $sambasettings{'DOSCHARSET'} = 'CP850'; $sambasettings{'UNIXCHARSET'} = 'UTF8'; -$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'on'; @@ -176,7 +175,6 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; - $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_KEEPALIVE'; $sambasettings{'WIDELINKS'} = 'on'; $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'SMB2'} = 'on'; @@ -303,7 +301,6 @@ null passwords = yes
bind interfaces only = true interfaces = $sambasettings{'INTERFACES'} -socket options = $sambasettings{'SOCKETOPTIONS'} remote announce = $sambasettings{'REMOTEANNOUNCE'} remote browse sync = $sambasettings{'REMOTESYNC'}
@@ -535,7 +532,6 @@ print <<END <tr><td align='left'><br /></td><td /></tr> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr> <tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr> -<tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></td></tr> <tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr> <tr><td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td><td align='left'><input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="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 =/d" \ + -e "/^socket options =/d" \ -e "/^syslog/d" \ -e "s/^security = share$/security = user/"