From patchwork Tue Oct 13 16:07:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3535 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 4C9gSt2NsFz3x3M for ; Tue, 13 Oct 2020 16:08:30 +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 4C9gSk2Fs4z1Gh; 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 4C9gSh6HPxz3054; 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 4C9gSf39CYz2xb4 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 4C9gSf28HHz19Q; 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=D+JaeDI4jjTMheobN4u3/wWs3XdZABmv3YmJsoLKEyo=; b=iz5O4bVEcEj5NtjlellCtRUxtKJluyY81b9ni5yodXsvojYtbnyq7roT65ZnTKUXEuTN0I IsteILkOCeb0l2Dw== 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=D+JaeDI4jjTMheobN4u3/wWs3XdZABmv3YmJsoLKEyo=; b=IGYAmtgVLEAZcyf572bHTQEfZZHvFmdENkYBivfunC+pTiMtcxfYmwnrWgdp0cgaiv8+3c ESFiyJtbV8AHn70Z9g6XOPrJOyF/wdpCEn8KJTKBw04P3/KmPEFI29OM0m9neUoxBP3p99 UOyDcyo6oJQwWOyd6PT3gZZFlNCdDcyo00/k/+2Rvt7G4G29kXavzUNlsHnh+yTfdRXhje 8a9aN4+r9Vi1QCVHguLI08QoWe4/EEzgZEn0AKE5VXrY/qXDe4z9YwsBdZx9NTdTdY/FWr KZYotFVB3dpaX6ROLPC0ZNSXG9nIwIlCIzRInaBgsWJMaoJj+1xP55BRD+bV+Q== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 08/54] samba: Remove deprecated encrypt/null passwords options Date: Tue, 13 Oct 2020 16:07:26 +0000 Message-Id: <20201013160812.27754-8-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 | 2 -- html/cgi-bin/samba.cgi | 2 -- src/paks/samba/install.sh | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/samba/default.global b/config/samba/default.global index 5a6a81729..30587e47a 100644 --- a/config/samba/default.global +++ b/config/samba/default.global @@ -16,10 +16,8 @@ smb ports = 445 139 unix charset = CP850 security = user -encrypt passwords = yes guest account = samba unix password sync = false -null passwords = yes bind interfaces only = true interfaces = green0 127.0.0.1 diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 981d5dcbe..fd43afd17 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -294,10 +294,8 @@ dos charset = $sambasettings{'DOSCHARSET'} unix charset = $sambasettings{'UNIXCHARSET'} security = $sambasettings{'SECURITY'} -encrypt passwords = yes guest account = $sambasettings{'GUESTACCOUNT'} unix password sync = $sambasettings{'PASSWORDSYNC'} -null passwords = yes bind interfaces only = true interfaces = $sambasettings{'INTERFACES'} diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh index 1cd6a1156..8b61298d5 100644 --- a/src/paks/samba/install.sh +++ b/src/paks/samba/install.sh @@ -36,6 +36,8 @@ restore_backup ${NAME} # Migrate configuration from Samba 3.6 to 4.x sed -i /var/ipfire/samba/smb.conf \ -e "/^display charset =/d" \ + -e "/^encrypt passwords =/d" \ + -e "/^null passwords =/d" \ -e "/^socket options =/d" \ -e "/^syslog/d" \ -e "s/^security = share$/security = user/"