From nobody Thu Oct 9 12:37:02 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 4cj8Wz1GG8z6BrkV; Thu, 09 Oct 2025 12:37:03 +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 4cj8Wz0LzXz3b5C; Thu, 09 Oct 2025 12:37:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013423; 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=LrvDJqNeAH0n5MQFhHiqdEpR3ifgZw32YIgrJGexQ4U=; b=WgReCczwAyd2HB+A2MPx0l/WnQUyTSgOIvWM9ZRgKBT3tUUM2khoNDss9xR4tjDwQBrIzY HWcjD+vHKGKIfh48AK6em6UhT/S/OFSyv71xApCazYq4Dyb5rUCYRXdxhKBHT3NWtyAlTK ldUUMBbFwXiBhywZd4+nIoNGZsVBgcluDaFjRAvHw4etbGlE7ZmRydWkQqM4heYjaBX5Gd 595U1WsdRC0DHsaC57L5YezaYnp05M4fDw4UjlCHAVm1Q7TtGS2xPecBnwkbP+J9onljur 67YVweDAjpKySK2UPrt+1eNTepKFJb255n97d437z0xs2G6tKDcdTVrxV3i3Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013423; 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=LrvDJqNeAH0n5MQFhHiqdEpR3ifgZw32YIgrJGexQ4U=; b=yAqV3/BBTm0OIbwX9jWRYTJe43lbmpbvZd+1hAmBOrcfUP5+vDlMULOxWNgn5zTx1PJP66 U6ks1T9BXEn0MfS7J3hy8dzrESFy5as0McmMPHZoUSRf+GKTj4mobJMssKubJp0PGyfoUX CZWz0EnVD99k14eqJM/kEK+dEhbASl5Lypb/FDMqaNmnc6jJgjevXd2KoI/XeBSIvuWKlk EYrY3saKLRRCoece8BbwXB7n4YmUT6cXrMJtJK9k+kysU056jyPahBGPHFIQBbNyvkr/mb qLjbqIEoKKyHi6ZUMKtrGqYPkQ9x7rYp879F/3eXyOes8zmzPGaYT88JUEsR0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013423; a=rsa-sha256; cv=none; b=quNQeqllK+bOlYZj24VGTd0a7Vxy2tvmDryCMC1h2e8X2HWpsXErIw3eW1KqdUI5TXtCMV ZnWp9BIIPGv4Vc7kw28JENVK7WUzuQmAXV33gj4t7gmMa2ds0NXlN/vvbubiRP5VJkEhDH WPEQYy3wRZEU9KY9m7JJuKAhI1y6S0wDtr9J0Lzu5KaI5dUMeOk41ZFXNcMbUgtoYyHQb9 5hFzVEosix2cK5wZJPBlAsGI569jPEerEXVOht8Kc2M0xiUQ0IeGHiHK+/2P/w4Ys4gtpq TshPrUnrLioMJ7z7I5EotlZZNq1tm7OU/5jE6bVaV1oU4qx99iCsUSMl2bMsgA== 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 4cj8Wy6xHJz2F4; Thu, 09 Oct 2025 12:37:02 +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 599Cb26k072528; Thu, 9 Oct 2025 12:37:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599Cb2jA072525; Thu, 9 Oct 2025 12:37:02 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:37:02 GMT Message-Id: <202510091237.599Cb2jA072525@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: c6a31e29ef4d - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: c6a31e29ef4dbd7022c15b1ebdf6494879850e05 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c6a31e29ef4dbd7022c15b1ebdf6494879850e05 commit c6a31e29ef4dbd7022c15b1ebdf6494879850e05 Author: Cy Schubert AuthorDate: 2022-11-02 05:28:19 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:57 +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)