From nobody Thu Oct 9 12:36:45 2025 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 4cj8Wd24TTz6BrY1; Thu, 09 Oct 2025 12:36:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cj8Wd1HBZz3Z4Z; Thu, 09 Oct 2025 12:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013405; 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=VKNXDX/BcklRKApEgVwTt2lN4B2PKbkd6toGwXc1WzQ=; b=HgSO8Zp9ftmz6BQu3ZJNe9XnLGb8NJcFVD/UJMWU4vFs4M5lejvUczJjds7mvwPp9wUBJh I2Fm4jEtmRK2Nf6MumACdkfmNp94K+ybnFqmQXJMxlxIuZR7WVoHSi6OtLnu7M6Ab9kY0y hX+kFQFMhwCvG/+BYqUg4CBeUZv1edaD6+UbqZD2vuIJR1Jm4aiFEtkuMyFrRk3q2caFM2 UPCZxNDwiVSJECzdS+s/n955cbtfx5gbUz+tH724SncS788eUPjzeG6YyewBIhR0Pm9WPy m+YmgMd8FZWWEJsza3Y/Fcg0Xoa7MCwxrSm0faJwtbKz3AhX+XMo9dyJ+aZuaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013405; 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=VKNXDX/BcklRKApEgVwTt2lN4B2PKbkd6toGwXc1WzQ=; b=rxUhL+7JCsT2HB36os9+q2zJg/2+DKQglZos69cHaxsYlq7LNlyhyv4CHNQOslWQXCIJSb GkSUoyk4J2LW8W59F/Pc59FuTVbjE1HKnY2Rw+mQQ08EcWWcx2WQzTPjz+fqKv55N38Cwl uJbh+mTctdPeZi6e4saoZ3/rl1rK+WNmO2FI/7BYrb8I3fR3su1qUea/mHjvhEFFgYx0e2 Y0PcqLVdkyVOGPDt0fmbaHmpNXo075UNfpAMUbLLkPvox2120iyPDm2wLMf/ebp+T6p6WZ awD2X9AO0TUFlD4x/o3onybFy8BayuQDLAUgc37wjCXDruxB3dm2JmujIo87uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013405; a=rsa-sha256; cv=none; b=IK0p5cCwN7u8QF+7iKjZN91OV9OzTv4iZO68jdydkU7qXuNHL1WCeenMHGP/ryixiZ82yV llg4zJveYZQDAQeYLVkxQudQ7fH0tRrTw66fOYKYhyd2Kgm0W9JBOQUPZtyi2EkR2gtMkN L5nU5He+gJwygvW4syBr1UqZd6HxeHKudLe7B4zittxkHFx7hw6YtGqVkTib4ZIFnQnL4r vJ/1FQ2AgixnxLe2Vg184GnzDtGm4XRCext8IkT5i1fkgZSwlSkqTIzDut55ClITusAXNw WEHOpb7LMc8ij+u1cMZB0iMZe1Nrne+rZobN+K3ka5boKbezK/MlZQLEng3YJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cj8Wd0mQGz2fb; Thu, 09 Oct 2025 12:36:45 +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 599CajIw072186; Thu, 9 Oct 2025 12:36:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CajE1072183; Thu, 9 Oct 2025 12:36:45 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:36:45 GMT Message-Id: <202510091236.599CajE1072183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 1ea48931d415 - stable/14 - ipfilter ippool: Flag deleted entries with "#" 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ea48931d415cecff119a71d1186929f333a8fc3 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=1ea48931d415cecff119a71d1186929f333a8fc3 commit 1ea48931d415cecff119a71d1186929f333a8fc3 Author: Cy Schubert AuthorDate: 2022-11-02 05:28:19 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:39 +0000 ipfilter ippool: Flag deleted entries with "#" List deleted entries prefixed by "#". This is consistent with other ippool list functions. Fixes: 7531c434a593 (cherry picked from commit 94758e72fdbd6b218e79884e22347eb357a7e51d) --- sbin/ipf/libipf/printpooldata.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/ipf/libipf/printpooldata.c b/sbin/ipf/libipf/printpooldata.c index bd5af316eb19..b203522734be 100644 --- a/sbin/ipf/libipf/printpooldata.c +++ b/sbin/ipf/libipf/printpooldata.c @@ -13,6 +13,8 @@ printpooldata(ip_pool_t *pool, int opts) { if (opts & OPT_SAVEOUT) { + if ((pool->ipo_flags & IPOOL_DELETE) != 0) + PRINTF("# "); PRINTF("pool "); } else if ((opts & OPT_DEBUG) == 0) { if ((pool->ipo_flags & IPOOL_ANON) != 0)