Date: Tue, 23 Jul 2024 13:19:31 GMT From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 4d8e3fafda19 - stable/14 - ndp: Fix libxo formatting for the prefix expiry string Message-ID: <202407231319.46NDJVlw004269@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4d8e3fafda19cede6b0bd8f4f3497a83e0c0287b commit 4d8e3fafda19cede6b0bd8f4f3497a83e0c0287b Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2024-07-15 20:06:24 +0000 Commit: Mark Johnston <markj@FreeBSD.org> 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407231319.46NDJVlw004269>