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 299AE67F2F for ; Tue, 10 Nov 2020 16:59:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 279FC247DE for ; Tue, 10 Nov 2020 16:59:28 +0100 (CET) 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 BDD92247D4 for ; Tue, 10 Nov 2020 16:59:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8450A46034 for ; Tue, 10 Nov 2020 16:59:27 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 10 Nov 2020 16:59:27 +0100 Message-Id: <20201110155927.2650445-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subscription.rs] Subject: [pbs-devel] [PATCH proxmox-backup] unbreak get_subscription without sshd installed 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, 10 Nov 2020 15:59:28 -0000 which might be the case e.g. in a PBS container Signed-off-by: Fabian Grünbichler --- Notes: we might want to switch to a different file as base? or even generate a file just for the server ID derivation? src/api2/node/subscription.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api2/node/subscription.rs b/src/api2/node/subscription.rs index 67797fd5..010a0209 100644 --- a/src/api2/node/subscription.rs +++ b/src/api2/node/subscription.rs @@ -94,7 +94,7 @@ pub fn get_subscription( Ok(None) => SubscriptionInfo { status: SubscriptionStatus::NOTFOUND, message: Some("There is no subscription key".into()), - serverid: Some(tools::get_hardware_address()?), + serverid: tools::get_hardware_address().ok(), url: Some(url.into()), ..Default::default() }, -- 2.20.1