From patchwork Tue Oct 13 16:07:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3534 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 4C9gSs1Tj2z3x1S for ; Tue, 13 Oct 2020 16:08:29 +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 4C9gSk39DMz1G6; Tue, 13 Oct 2020 16:08:22 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSh704Fz3056; Tue, 13 Oct 2020 16:08:20 +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 4C9gSg0R9fz2xb4 for ; Tue, 13 Oct 2020 16:08:19 +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 4C9gSf2rNmzlb; Tue, 13 Oct 2020 16:08:18 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605298; 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=wtl6sf/Ch7XYFukedrR5FaZAcprjP7xMbJegj43+3nM=; b=FTr/rH5gicyGClVWZvSH3q3VDuLH1mxMNQ8B4oCcAnb+9XJpNM+LvgPDngCDZBBYFgsmM0 ViLMTIGYJElVnXDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605298; 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=wtl6sf/Ch7XYFukedrR5FaZAcprjP7xMbJegj43+3nM=; b=Y7rze8vR8iSI5XgXltkEX0svdq+wbIi7Tqo8YxZ9GY+0hpxbulwb1tpt7UQlKaPSIfyWF+ PO6JFnaYWHwZPR+2N2ShH3O+uSze52TP6Es9OpvfL3xB9buUSJnyXS9pfY0BxsRhGgTK34 LzIpBsb9FyKusFGDf683LeYhDlOATv7IhGiN7NBEAdEAcnkaHvQUxsEk5pB6EHl7BAuCAC VtEfbfmp2t5N8F82CRizo3VBe93MipeE9u4D6/R1Ol7lzYlH1p3WxWf8nSoJN5dZhwvFJ+ wwWZMrcNbl3NwXAUFRs8JIlWLdkWmQIyJ7gJNvNG82fJQO+bEWox+pGmNzFk1w== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 09/54] samba: Remove any options left to default value in global section Date: Tue, 13 Oct 2020 16:07:27 +0000 Message-Id: <20201013160812.27754-9-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" Signed-off-by: Michael Tremer --- config/samba/default.global | 17 +---------------- html/cgi-bin/samba.cgi | 8 +------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/config/samba/default.global b/config/samba/default.global index 30587e47a..05d09a9a2 100644 --- a/config/samba/default.global +++ b/config/samba/default.global @@ -6,14 +6,9 @@ server string = Samba workgroup = homeip.net passdb backend = smbpasswd -keep alive = 30 os level = 33 -fstype = NTFS -kernel oplocks = false map to guest = bad user -smb ports = 445 139 -unix charset = CP850 security = user guest account = samba @@ -21,16 +16,6 @@ unix password sync = false bind interfaces only = true interfaces = green0 127.0.0.1 -socket options = TCP_NODELAY SO_KEEPALIVE -username level = 1 -wins support = true - -log file = /var/log/samba/samba-log.%m -lock directory = /var/lock/samba -pid directory = /var/run/ +log file = /var/log/samba/samba-log.%m log level = 3 passdb:5 auth:5 winbind:2 - -preferred master = false -domain master = false -local master = false diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index fd43afd17..07665e8f1 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -283,13 +283,9 @@ if ($sambasettings{'SMB2'} eq 'on'){ } print FILE <