From nobody Mon Jul 15 20:22:43 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 4WNDCR2TwKz5Rb4p; Mon, 15 Jul 2024 20:22:43 +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 4WNDCR1psFz4f2R; Mon, 15 Jul 2024 20:22:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721074963; 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=/jCwvTx4uNjZsenYc+ZGXdPoMFtIqkCaatHFbFgVZZk=; b=ZcfbwAQ04QW9bBlqug8OSNhXN+WTkASu5Q+C0I9euuw4TX4+i7urQeJSeIXqmqEb4ajyMT ua6Ajc3Gc+yQJb5siiUJhksbu08pXI78urZqZa2cvkawEAROnWhSMn9Dz8teGKBcl3PZ/U o/j4HDjSIQKFK2MsySfrDtjotRfWoVsUcEkPU09Jg/RMe2XbU+9fmSq4LCOD1kSNDHkhjR j1ffYatD4gWj6YoHszXLNKY8HCg5iDlfts4YOt1eIXPiVvd0nsmJpUPH0eCSNh49fa95iL oE4H+WqOtF58Iqhj3/vtvNuBHIPFk15/U4U1G6unlBqey1DDVOpm5Rpw4XEdGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721074963; a=rsa-sha256; cv=none; b=jtvMS5HMpTZrOSENxIuQ+LL3m3yJ9s/kwfcuiZgvFpjLPtCiRK7prji9lw9IR1+BBHj2lB Ahyo3g9Cbek9N4+fdK5ucs7RGCqUbj7nYlmG9m0SfURKJklcMAw/G/7TNLDTFtjzm1bXjq lJ3Hk/o0oc4uJbibYUg7GE8CfT5GoSWnHUU2W/EmGnZJsTIFcWVbT7j2IyvrJsNaqjQWws Xb6gPlL4ROPFwHqJthQL2kGLl88LbK0lOsBZ1U67Gz4vVzhnHQtiuNoVXrLLAU3TpFYCb1 GHTudBfsr4yo+OTbFs3eY4/BEcUa7OsJek2byOFnA4dPqV0tx/nJkqy8dhpSzA== 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=1721074963; 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=/jCwvTx4uNjZsenYc+ZGXdPoMFtIqkCaatHFbFgVZZk=; b=DR9xcwUlcYN4wjdEeIokMJRGJKqahTZesA2sqrDxVlEBtlvIXZtiWPbDtQmnUgedjuOpum tCTomdkjonWHwIyxaUwh94hHMoksnvk9NYndvur1NGaR9ixOTVLdUT0y5vWRiVqdoCb7a7 UWAM+fPW08C85OHUj0JlJ9syDbU8RHPeABnBZy0NLVIiIWF4dYVxmVPIMFEuVuVh7XXpVK hhufCNeGHsLLkFKEfizq2KSSv00fGnzWb++XZ9LyrpsCXgOkASTweV9o3BvAdxtMOH6pge Cz3XSIBNfYUHfaao76+qbR20ou3wPIxj+2wo/9WNe36a/kdreHgWihgTU6/gRw== 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 4WNDCR1L9Vz16M8; Mon, 15 Jul 2024 20:22:43 +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 46FKMhmM057608; Mon, 15 Jul 2024 20:22:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FKMhGQ057605; Mon, 15 Jul 2024 20:22:43 GMT (envelope-from git) Date: Mon, 15 Jul 2024 20:22:43 GMT Message-Id: <202407152022.46FKMhGQ057605@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: b3877767883e - main - 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/main X-Git-Reftype: branch X-Git-Commit: b3877767883e9b26fbcce47c015ba3eab323bf1b Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b3877767883e9b26fbcce47c015ba3eab323bf1b commit b3877767883e9b26fbcce47c015ba3eab323bf1b Author: Mark Johnston AuthorDate: 2024-07-15 20:06:24 +0000 Commit: Mark Johnston CommitDate: 2024-07-15 20:22:00 +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 --- 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 dcb3b5e3571b..637aac2823ed 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -1334,7 +1334,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);