From nobody Sun Oct 11 17:39:33 2026 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 4j2nsd32tSz6vYpT for ; Sun, 11 Oct 2026 17:39:33 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2nsd29YSz4SQv for ; Sun, 11 Oct 2026 17:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791740373; 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=A10vu3x0S0WrR3NID+rJg8Phj8OgRP1neLyjusv4+Mo=; b=XuP0xF0PJI6rYJdhl+7GkWtPC/Dne3FShKxKhFf5meSTiWYk84sL1KdVjXSt3UWHFW2Q0X sUUtfSGjQCVD0c4HNEtriyW8cg/drpBUjqcqWLWVUxLRnv4UyUXhDrW3v0W4/UyN2t5FV1 Z4Q/82GIHh/X03cze4kPd6dSl62i20+aK2dsIXWltqAxtgqUKkHBJomx/RdZnupt2Jlpe6 QOd/rC4xpUb2eh22z2GIP/Wjznmy8/RmLber6FHMRZdw4+9/EbbElZP7q+IuGSr4LFjMMn GWGEF31ZlsktpkUxV82nv6NhyDT/qIWhoiPbZCU+nIy3KMmr5P0hlfWcafEKdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791740373; b=ZZUitV2wZ21HFgTp+H1CniwvRzEwfPIMUT75BXvcmn5N5LdniG2srpRnND0hzKHUinG7XE 4bEcL2aO8AjAbIsBi1oE0zTTR9i9FWJdcMq1U75W9J6hrIeNLgxo5AGvjHUn9Lrsz1BkAD BgOwdMZFcs1I2ORLGBV2/o3bzUwuvtlB7RJibgjuHHUC1x5ClQsRt6su34PRvnT9EGsq8z I3bFR0wOFpWO8B7l/IzUgTAInMNq9jHgmepzsJ4YKaF+kXW7CLq3ybULiicyYsL6VU0vG4 lNSDXcLGFkhX9yHqCorf1JAyYfMiaMyOTh4mmFAVC+LRjWmfxkHZ2r9jZR3Lzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791740373; 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=A10vu3x0S0WrR3NID+rJg8Phj8OgRP1neLyjusv4+Mo=; b=voYB9O2QkJAhxDMUr5uMrKPdowjHBcofGt5lK5IelpqptEyLJMrFe7sy46VVO0sKi2P8OS ntlf/q3cQOKfpVJweX0VPYPymlZnMXWYKGnSGo62BTbkvfY2CgGSYX1yHifxqlLRKMLEWD 3oqHiphgfT4NaMi/2Z/V4DF5QOSRwWftU9UsGMYdddRwz2AuAjNXmxa3uypQyjWoCKoC/h Fric/j2Jj9jY0HEuKgEumzoUksuifWmimq6Xk3MPOUZr+VCnPrn2ePV6TyNkFdUeSATc9/ mDflFfWZNChpNz6m2CI3pLyk+a73HpzkN9zcumkSzIv0wlMBKLGgaipdCobyJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j2nsd0xDKzs1T for ; Sun, 11 Oct 2026 17:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2727f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 11 Oct 2026 17:39:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: R. Christian McDonald Subject: git: 40d42dc214ba - main - pfctl: remove the prototype of pfr_ina_define() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rcm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40d42dc214ba0bcd283c5ccc34909a17b8a43455 Auto-Submitted: auto-generated Date: Sun, 11 Oct 2026 17:39:33 +0000 Message-Id: <6acbc9d5.2727f.79888406@gitrepo.freebsd.org> The branch main has been updated by rcm: URL: https://cgit.FreeBSD.org/src/commit/?id=40d42dc214ba0bcd283c5ccc34909a17b8a43455 commit 40d42dc214ba0bcd283c5ccc34909a17b8a43455 Author: R. Christian McDonald AuthorDate: 2026-10-11 17:03:59 +0000 Commit: R. Christian McDonald CommitDate: 2026-10-11 17:38:40 +0000 pfctl: remove the prototype of pfr_ina_define() The function went when DIOCRINADEFINE was converted to netlink; pfctl calls pfctl_ina_define() from libpfctl instead. Name that one in the error message that pfctl_load_tables() prints when it fails. Fixes: 219ce3063840 ("pf: convert DIOCRINADEFINE to netlink") Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 2 +- sbin/pfctl/pfctl.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 146a1241d78d..75ee6c700bbd 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2476,7 +2476,7 @@ pfctl_load_tables(struct pfctl *pf, char *path, struct pfctl_anchor *a, pf->anchor->ruleset.tticket, ukt->pfrukt_init_addr ? PFR_FLAG_ADDRSTOO : 0); if (e != 0) - err(1, "%s pfr_ina_define() %s@%s", __func__, + err(1, "%s pfctl_ina_define() %s@%s", __func__, kt->pfrkt_name, kt->pfrkt_anchor); RB_REMOVE(pfr_ktablehead, &pfr_ktables, kt); pfr_buf_clear(&ukt->pfrukt_addrs); diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index c540c6348d84..bcec429cdf78 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -115,8 +115,6 @@ int pfr_set_addrs(struct pfr_table *, struct pfr_addr *, int, int pfr_get_addrs(struct pfr_table *, struct pfr_addr *, int *, int); int pfr_get_astats(struct pfr_table *, struct pfr_astats *, int *, int); int pfr_tst_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); -int pfr_ina_define(struct pfr_table *, struct pfr_addr *, int, int *, - int *, int, int); void pfr_buf_clear(struct pfr_buffer *); int pfr_buf_add(struct pfr_buffer *, const void *); void *pfr_buf_next(struct pfr_buffer *, const void *);