From nobody Thu Oct 2 19:06:16 2025 X-Original-To: dev-commits-src-main@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 4cd1VJ5sxLz69pKY; Thu, 02 Oct 2025 19:06:16 +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 4cd1VJ54v9z3D0X; Thu, 02 Oct 2025 19:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759431976; 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=sLOQrYk7gi8xM6YHzebY6tothxDUu30cRfVJ2FXjCt4=; b=gQEepBRotLcJsyQpR7BimwaGiNeiXuCNpi9DXFa/+SCrVR724vGpcAi8dXrYubtKhZ966x WEHhOELaH3HojKdyhHLBHXhUzYrqWNhp/VMoQDEDHxhxit66AUdYoX/wJhqLSJojU9rr/E EHlVm7FxH00d7le5Kw9E+lcWzgbjZ3YDeGBLAtY4I0sLp9Cd8R7/oISK1hoPNsdxNT5qCa nZkK3rh9H8YCUeuWvErztp6d5kHEysvcchPU6xA2EOlSHsjQvWXw6EqVxxLu++RjIiUA0B FlGZ/deWimphJo7siGTfWji+sBrff1rN27m/u7pMMOkykaiKiXtzHwjmTBYQ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759431976; 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=sLOQrYk7gi8xM6YHzebY6tothxDUu30cRfVJ2FXjCt4=; b=iDhvhAp9az7NY95KHhAU3PwX8uxEgUtNyRieM366YhBr7ICfLbL4Wl0KO749HO7MYUx1uy hK0zHp9S5aZE40RvtVc8sRgvGwI6NiVH2T/JUUa0bbk1xFCF/hJEimjIaxdQvqfjXUIO1y bQX13q3048TWC7juTl3Bs9KgfTn/que8vKk7ZGnX620MQ1VcbqIT6j7ffi1a4q9qC00kXZ 4LJVxoTxeQDG6CrfTDnghTKTAFjH4ZezeKkIB8VOQRujc/hY5p5H2w9/ge8369mq5T6qV9 jzlmJuLeW4IfAKW9XDKHTjyBaaUQUPjUNnZ77QfmotSEwmy2cP3F5CbC50/j0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759431976; a=rsa-sha256; cv=none; b=h4ZsvyGSTBDvdpKMxUTIOXp499daJ7vrTdpqEh7h7VRajuJSzz5O/0D+vxqFRbZhm8S7VB WxWpq8/xBp1CBTW/PmSdVUqNOCuTGCNwmOZZdNq85dVQcKymY9UL/kObJHqBJYkjlWi1zh sXqZdV+mG7Wcn1gW+amGAeHxnM+najErcbIuqNZm/9V9MA0FpGyA/UM5PIbTLXAJsNsHxb 5t7jgbAP/Ip2jWGrlnVPseib9CJi7JfW1gy5MOIFIMwePm1bVZbmgHOzT8Ezil5r+MjjU9 ro4OqkxBGzqZn6SrfVTq7M9JjBQtalmerdSRJtSlqMrI77sZkaPJvq9lpolLCQ== 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 4cd1VJ4hB7z5ST; Thu, 02 Oct 2025 19:06:16 +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 592J6Gbu078690; Thu, 2 Oct 2025 19:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 592J6GO3078687; Thu, 2 Oct 2025 19:06:16 GMT (envelope-from git) Date: Thu, 2 Oct 2025 19:06:16 GMT Message-Id: <202510021906.592J6GO3078687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 94758e72fdbd - main - ipfilter ippool: Flag deleted entries with "#" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 94758e72fdbd6b218e79884e22347eb357a7e51d Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=94758e72fdbd6b218e79884e22347eb357a7e51d commit 94758e72fdbd6b218e79884e22347eb357a7e51d Author: Cy Schubert AuthorDate: 2022-11-02 05:28:19 +0000 Commit: Cy Schubert CommitDate: 2025-10-02 19:03:35 +0000 ipfilter ippool: Flag deleted entries with "#" List deleted entries prefixed by "#". This is consistent with other ippool list functions. Fixes: 7531c434a593 MFC after: 1 week --- 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)