From patchwork Tue Oct 13 16:07:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3530 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSl6tmFz3x5t for ; Tue, 13 Oct 2020 16:08:23 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSh3fjLz1GH; Tue, 13 Oct 2020 16:08:20 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg3nQ2z304c; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSf0Sdtz2xb4 for ; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSd6ZGgz19Q; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwrPOLQx6QMyzWX8iJBqMeVQE2jlQBdXpCSwPn/LJrg=; b=VtDjJqkmosoqCx/FMCjmcgPUF3STXOMDLKzx4kQaYlAu/GPJMaKVTYfacJItHv4wplg1RR cETyCIHHDyOC4/BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwrPOLQx6QMyzWX8iJBqMeVQE2jlQBdXpCSwPn/LJrg=; b=oN99Kx66grKHbYbkq5tK8X3bt00sfBlblXIlV26T1Ms8FoaLY+zhdyMpeUMOC4ho+Xz8V2 JswFsWglS8Y6FD+jsSAUqVgYnuHA6dlTProEAsyoP+xGcIIPVzL915cs7pxEu2tnkX8eWw OC0wZt8+ThOv0NH3lvefhSzPpie6lIc3gk7iI/8Xw30q+EsoWl/+kKbilHQcoJcY9xrG7S 9L5ztjuHNK2dJpbYKgHcyFH0lNC/pKEEsXMKFcBC2LywJB61b2IK0zEv0MPPvN8Uu+LtSV DMr9X70eq7ep/it5/jkkB3CfeiP+MPmcU1O00BjKxMm6GKLgzUGzX1ls82AjjQ== From: Michael Tremer 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> References: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 <
$Lang::tr{'network options'} $Lang::tr{'os level'} -$Lang::tr{'socket options'} $Lang::tr{'remote announce'} $Lang::tr{'remote browse sync'} 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/"