From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D001B70D38 for ; Tue, 6 Apr 2021 08:28:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C2FFE29B6E for ; Tue, 6 Apr 2021 08:27:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8D84E29AC6 for ; Tue, 6 Apr 2021 08:27:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 54B0C459C3 for ; Tue, 6 Apr 2021 08:27:49 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 6 Apr 2021 08:27:46 +0200 Message-Id: <20210406062747.9356-12-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210406062747.9356-1-d.csapak@proxmox.com> References: <20210406062747.9356-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.172 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 11/12] config/tape_encryption_keys: clippy fixes X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Apr 2021 06:28:21 -0000 fixes: * combine if branches * unnecessary clone Signed-off-by: Dominik Csapak --- src/config/tape_encryption_keys.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/config/tape_encryption_keys.rs b/src/config/tape_encryption_keys.rs index 42c3184d..db3c9fbf 100644 --- a/src/config/tape_encryption_keys.rs +++ b/src/config/tape_encryption_keys.rs @@ -201,17 +201,15 @@ pub fn insert_key(key: [u8;32], key_config: KeyConfig, force: bool) -> Result<() None => bail!("missing encryption key fingerprint - internal error"), }; - if !force { - if config_map.get(&fingerprint).is_some() { - bail!("encryption key '{}' already exists.", fingerprint); - } + if !force && config_map.get(&fingerprint).is_some() { + bail!("encryption key '{}' already exists.", fingerprint); } let item = EncryptionKeyInfo::new(key, fingerprint.clone()); key_map.insert(fingerprint.clone(), item); save_keys(key_map)?; - config_map.insert(fingerprint.clone(), key_config); + config_map.insert(fingerprint, key_config); save_key_configs(config_map)?; Ok(()) -- 2.20.1