From nobody Tue Jul 23 13:19:31 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WSyRR6ThNz5Rwrn; Tue, 23 Jul 2024 13:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WSyRR63K3z4HSW; Tue, 23 Jul 2024 13:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721740771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPgLLaQ7wFaHEWTLl73zRD5dK+k6NGGQxxqhRXqTdtg=; b=n85lkuJZsDBa0adqpFqdrvZSZ1ulSRKAKRfGx0whweinFPqkSAMPYLVl9IAKaJToNkmkJY W37d67ZxtUTk8J2seT1ez/G+uWrUaTGJiWaSCRPwdp5M9fKhjL2QOii98trUHNvQ2YT3tP hgpbtyVr9CZQd35/4qDOsYCy3jmbO0X2UO+DygDW/x9hHI97lFWSZaQXQJIL0v/PhF2LQF BILvKNINkT8IFXqXgbakg5mLfWL6B7hC0YJxBDN8U5d7zLJAVG8cwtPwn6KJhmBbdm3yp5 nRzsIy5uX3eWTYjo6Zn3/wFKtgSxpOg/zlmvZD0xLJce+5oQRBY6APF4a72qQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721740771; a=rsa-sha256; cv=none; b=SFYlDFQ7mS/mEMGGqKB5Fvuiait9rhwZyY7wDVcHEtPX2Yi6CmW06JopNuhFBQzmIg2foP SiaGzHQ1varjC5XlwKCf8HhaRl22p5dUFPkRmMpUY9IAYB6TzJzlOX8YHJIeig0zTEr3rM kOLb+CBm1c4IBl0S2ah8lAF4I5wLYor7vXT5/9q8Hl04iY1zRjnlYzHVKdctU9Gl9LS3if m8l8DrVkKLwPOdPsiPmlC//psilyCiGDLal8QrH3EXD6e7Nce1tDUcBF+yTpPHaYBp9l1s VkGvQSrmp4rW4HiTkThLsspzySlhWWpigIH1dm9vLmKvgEeLaiZTE4joR7GC0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721740771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VPgLLaQ7wFaHEWTLl73zRD5dK+k6NGGQxxqhRXqTdtg=; b=reE9IznP43dJCb8x9AkChFJt6/1iqxdtsz1erD49L02jU2f1DWvY9VfM4zVn2Auhnge2ZF YYigcpIf2nlkxtM3ZCA0WY5sK0U8aJuj+sEU+BiHtvCQ2V/Hc/JXLhVK9H8vHRYk1hlM+k WcJ5Qk/AhIYrFjXRro46y0XhWDwJKwO1W+HvkfvzgJpb84HP+vt3GCSfctd6bpXzcV8NQZ FkLON6jJYqKONO4GZN5Ci7Mv5f+6thdIAS1b024ORMHlBWQHIKnxJUm/9RH/RAz4RY9k+m X5RlTddBcvNo7cLSIryNA5LQ0PelvzqysUOEE9lPEwDZvFV7WlbOwo4qqViNIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WSyRR5ggbzVvL; Tue, 23 Jul 2024 13:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46NDJVMl004272; Tue, 23 Jul 2024 13:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46NDJVlw004269; Tue, 23 Jul 2024 13:19:31 GMT (envelope-from git) Date: Tue, 23 Jul 2024 13:19:31 GMT Message-Id: <202407231319.46NDJVlw004269@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 4d8e3fafda19 - stable/14 - ndp: Fix libxo formatting for the prefix expiry string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4d8e3fafda19cede6b0bd8f4f3497a83e0c0287b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d8e3fafda19cede6b0bd8f4f3497a83e0c0287b commit 4d8e3fafda19cede6b0bd8f4f3497a83e0c0287b Author: Mark Johnston AuthorDate: 2024-07-15 20:06:24 +0000 Commit: Mark Johnston CommitDate: 2024-07-23 13:01:29 +0000 ndp: Fix libxo formatting for the prefix expiry string Fixes: e1c7783e220b ("ndp(8): add structured output formatting via libxo") MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Bell Tower Integration (cherry picked from commit b3877767883e9b26fbcce47c015ba3eab323bf1b) --- usr.sbin/ndp/ndp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index b7bc25dd7aa4..4f7c32f0fdf7 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1329,7 +1329,7 @@ plist(void) if (p->expire == 0) xo_emit(", expire=Never{en:permanent/true}"); else if (p->expire >= now.tv_sec) - xo_emit(", expire=%s{e:expires_sec/%d}", + xo_emit(", expire={:expires/%s}{e:expires_sec/%d}", sec2str(expire_in), expire_in); else xo_emit(", expired{e:expires_sec/%d}", expire_in);