From patchwork Mon Oct 5 20:17:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 3515 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 4C4sMz0nz4z3x0p for ; Mon, 5 Oct 2020 20:17:35 +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 4C4sMp3pB2zsJ; Mon, 5 Oct 2020 20:17:26 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C4sMp35kcz2yw4; Mon, 5 Oct 2020 20:17:26 +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 4C4sMm5gBQz2xZw for ; Mon, 5 Oct 2020 20:17:24 +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 4C4sMm3ryXz1Ff; Mon, 5 Oct 2020 20:17:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1601929044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=VqsjM7xP5YlO7cNv2IyqYweGmEMxx7QXqGps048dZeY=; b=Yxba4YI0Ncdheog5+10eSYhuSoRhgw1qdUL9yjlQ7wYbl5A6M8ZDBWtF3OpCuzQPg7uwTH F49sb09iB6PNipDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1601929044; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=VqsjM7xP5YlO7cNv2IyqYweGmEMxx7QXqGps048dZeY=; b=GIrfhQZf6kYd+IZa89BcO0CAbP2qYgZL5y785cmfrkEvvk33GldyROnztKoY8aT+i/eNnJ T7CUGo+0ltvIP4G2e7htJ+s3vCmSvB7he7cC5giwMN+mKS8CCqZ8DDH7aUEgcM89yc80Kl NpbOSxi6u7HtXDo3FxQikfolJCB9CC4TLMedzGFaUJvixStkjE6mtDspcqOIPeGIXnOevS TenkanOsZ4rsPRWBoveFk92LAXxjvz9IguCgfjCoroPbLoDFviCVfpXOtDXRyy/l3UdK+a TNVlqlvJIUod2jgEKeFKxWPNQv68bV/yvme8a7eADbcX42mc+ebJPZZM56aJMQ== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH 7/9] samba: remove SO_xxxBUF size definitions from default config Date: Mon, 5 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> References: <20201005201711.4259-1-arne_f@ipfire.org> Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=arne_f@ipfire.org smtp.mailfrom=arne_f@ipfire.org 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: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 = 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';