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 D8B9561E98 for ; Tue, 15 Sep 2020 12:21:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D33971951D for ; Tue, 15 Sep 2020 12:21:12 +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 639C619513 for ; Tue, 15 Sep 2020 12:21:12 +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 30CDB44C2B for ; Tue, 15 Sep 2020 12:21:12 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 15 Sep 2020 12:20:53 +0200 Message-Id: <20200915102054.2866527-5-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200915102054.2866527-1-f.gruenbichler@proxmox.com> References: <20200915102054.2866527-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.221 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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. [time.rs] Subject: [pbs-devel] [PATCH proxmox 4/5] time/rfc3339: add leading zeroes for years < 1000 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, 15 Sep 2020 10:21:42 -0000 strftime(3) does not mention this explicitly, but years before 1000 have their leading zero(es) stripped, which is not valid according to either ISO-8601 or its profile RFC3339. Signed-off-by: Fabian Grünbichler --- proxmox/src/tools/time.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxmox/src/tools/time.rs b/proxmox/src/tools/time.rs index 5747854..3869757 100644 --- a/proxmox/src/tools/time.rs +++ b/proxmox/src/tools/time.rs @@ -168,7 +168,7 @@ pub fn epoch_to_rfc3339_utc(epoch: i64) -> Result { bail!("epoch_to_rfc3339_utc: wrong year '{}'", year); } - strftime("%FT%TZ", &gmtime) + strftime("%010FT%TZ", &gmtime) } /// Convert Unix epoch into RFC3339 local time with TZ @@ -197,7 +197,7 @@ pub fn epoch_to_rfc3339(epoch: i64) -> Result { let hours = mins / 60; let mins = mins % 60; - let mut s = strftime("%FT%T", &localtime)?; + let mut s = strftime("%10FT%T", &localtime)?; s.push(prefix); s.push_str(&format!("{:02}:{:02}", hours, mins)); -- 2.20.1