From nobody Wed Feb 19 10:41:43 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 4YyXy05fnNz5p9d9; Wed, 19 Feb 2025 10:41:44 +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 4YyXy01PtBz3llm; Wed, 19 Feb 2025 10:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739961704; 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=iRjZLMUI0aAJiXgRnhUFWPzuN+5oJr6eTWxNBH+SW7M=; b=Ad3NmIx0QuMhPAPL0YBjPj1jx7ZNLaKmKM0jWR3KSqOyqYg1nNoQ+PhdkCdgEpafv5Kt/9 jAgPUZM5VRXeuFaVLl2Rt9MA7q2ygc8Fi/gML76yHWlMQbwuhBY5XgXmM+xpJbBmenztPR 9pkHYuBTuMg78RDuaLubM/iBM+xhBIgXdl2ZBexnGaRVB3NnO+3LX3ccJCfxYr8oQcqMkd q2yQBFMjSmuRp2nb2N/KqY3juHQnZy15VHxjw0RJfyLWmbpkdTRMBviOGMDqvVaiS3oD// 95f6ueOfsBiulT+dEhrmpnx/THVwgwTcZ6CqMRKbfo4N+cJLLiBl7/NfSUmWLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739961704; a=rsa-sha256; cv=none; b=eM18llJwUj7gX6/3h6DForltjw+njNZ2Yya2Bqw515f6Qqln2x6HSWJKkNtbfD11oP9hlJ nUe2FECjfXMYJ4kMnyxAAKTVLExO8tZJsi8UK/2jYdNnhglZpECXHPJVFgtHASkDoNewJl gCJKO4A1jD3oB7sxltuCIrg0xxP22EZ9KSc78hsgUI9oKu3RAuOt2bU2Od9EHzPxEGZERj BcI1+oyK/Snysq8JSnPxMwcorYMU1FQUw0Yh2g54ECbwMI0DH6eoYiixAhPd8NTS9yMjwS MUA/f6ZW/WlziDI+wtY0an9b5mv+CpBtQlWgDwqDEU5vh/2IC4a0uMVBwRFGJg== 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=1739961704; 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=iRjZLMUI0aAJiXgRnhUFWPzuN+5oJr6eTWxNBH+SW7M=; b=WuyZ2JlDStEsbmHhOggpGXGkDPIiOxNWNw6mMnCtLs+vBfayOn04Qdy8wApleS0jY9e7ur yfQ7aK2krAemkMWrHnUnyxyPGVFVBpZQJ7178zOZsBFJ2H9JQJ3gdZ2ZFmrzsnmOSlxgon ZVnZthLs+WW299Sn/i9k0VfgeCURqqUp0NiUPmHZNyIVipli6tCNDkPfv6pcIRoA0GSZBY jTsHbK7lNiKQRf2aVsVtjD8soQt8a1K1Epr3S4obKqOsX2kivD1PtjxDYKPNa9P1LRoJgx /4MES0EtOHnID/dWMawCRdca9yI1W+cYWZNRMOBO6thHsqtb7J3MjOgtKiilCw== 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 4YyXy00Yrpz12gf; Wed, 19 Feb 2025 10:41:44 +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 51JAfhZH035510; Wed, 19 Feb 2025 10:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JAfhhw035507; Wed, 19 Feb 2025 10:41:43 GMT (envelope-from git) Date: Wed, 19 Feb 2025 10:41:43 GMT Message-Id: <202502191041.51JAfhhw035507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 81dc007a00a9 - main - pfctl: improve warnings for limits 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81dc007a00a9d160653398afc80a58725747d24d Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=81dc007a00a9d160653398afc80a58725747d24d commit 81dc007a00a9d160653398afc80a58725747d24d Author: Kristof Provost AuthorDate: 2025-02-12 16:41:18 +0000 Commit: Kristof Provost CommitDate: 2025-02-19 10:41:10 +0000 pfctl: improve warnings for limits If pfctl cannot set a limit in the kernel, print the name of the limit and the requested value. OK henning@ Obtained from: OpenBSD, bluhm , beb5ed50a7 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index e05c96a252fc..fd76a1926457 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -2470,9 +2470,11 @@ pfctl_load_limit(struct pfctl *pf, unsigned int index, unsigned int limit) { if (pfctl_set_limit(pf->h, index, limit)) { if (errno == EBUSY) - warnx("Current pool size exceeds requested hard limit"); + warnx("Current pool size exceeds requested %s limit %u", + pf_limits[index].name, limit); else - warnx("cannot set '%s' limit", pf_limits[index].name); + warnx("Cannot set %s limit to %u", + pf_limits[index].name, limit); return (1); } return (0);