From nobody Fri May 9 22:16:22 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 4ZvNd23Pgcz5wCrr; Fri, 09 May 2025 22:16:22 +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 4ZvNd21w1xz3RN3; Fri, 09 May 2025 22:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746828982; 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=m0QH7JD91oswwEr8m5vZrpEDzommpLcVQre+FGmhrWo=; b=qoAITRopjA/W6lbjWxex5Z7l9ZzM4pO/MbBfOGJrcFiJLsiPT/YaMWoxqbYJJzSOqoGvOM 2UuPFsqGWKWXbJvOJ2vJXcjAH+Z1PZjoHeCUT1/pq90BSzm51lX5Pd6B5B4RfI4ex4R6n2 thjFPj3rXG/FBa4UpkyHfH9O02pHzHY5Bxi/+b/YTOfd2Uhy+vPDdNLc+B/oJrfwuyM069 1axXyTwppryd9OiYT/x9+LskLUzy+p4dvQqhEPYw2fPU3TE5n580JnJ6oePX6RkeloAWSe KU5vj/CKDeVEXnKOq9mTMG0LEyE++ie0F+ePbqu2gmMZ58lBI20qPvIsJ7f/fA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746828982; 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=m0QH7JD91oswwEr8m5vZrpEDzommpLcVQre+FGmhrWo=; b=BJvcQLlmV9hKz5WQ8d5rXzZPsyaSQqvnAuptwjPzUWIkXGiP0S+RgfF8O3s+GgwZcLwDw0 7Rl+RoS7O+JD54kwh91JQ4QNgWIdUnT5Bl6fOAYjoXgea8o9BpJO7axQAbd8aOR9KzRMvg 7IyMJ7osYutVum+Lbg3Ee/Xf/pUg6jZXhgK9WeRnNjTpgEaPDItlKWkWIK9BCXBnoQSe9h KbdwYBviWnRo8e/X8eap0Tltv1vI99e6oFg8jylToHUtyMP/6v5oiy7jyz0eoZx1Vd+VYl DH+Tpwa+j78PzeVneKSPPGz6SdODRKHMWqxhzCGjTbkSkmmPlmmVubAuwFPj/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746828982; a=rsa-sha256; cv=none; b=m3ppihrpmpksmEsN+IO3Rp2fbn9MVHsfeWXd0sOvSJztGktJ9M5pWn7zWCoaXLjgmumvkB /VaLs/artR3R+sMXJ97LqzNVteZB4tZubBmcMHsJI8fQt0ARUupXavLSIZYJbY/ebRJ336 ehjNEVWCQmP7czar0vssG0mOCEGIsqtcTe3PzbL9uaqQ7xc7jSu1EQ8HiJ9FTjS74lnxvo 5KSzzodDEhhxBvO8pEi0u9qgY7bcSh9mC/js9HAfc5ekSjMLbvvfLYG3iU4rRnUZivecg2 ttbFKk0r/iwNDCLRm3qrlyyS7bgN7fQw56KxeTFtxQ31/fd8AddAKqCQsxo+Hg== 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 4ZvNd21QWHz3c7; Fri, 09 May 2025 22:16:22 +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 549MGM3x063053; Fri, 9 May 2025 22:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 549MGM5o063050; Fri, 9 May 2025 22:16:22 GMT (envelope-from git) Date: Fri, 9 May 2025 22:16:22 GMT Message-Id: <202505092216.549MGM5o063050@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: 138e34cffe3e - main - pfctl: rather than printing the wrong function name, dont print it at all 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: 138e34cffe3e611634efc8b92ddb8b9709cc106b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=138e34cffe3e611634efc8b92ddb8b9709cc106b commit 138e34cffe3e611634efc8b92ddb8b9709cc106b Author: Kristof Provost AuthorDate: 2025-05-08 15:21:42 +0000 Commit: Kristof Provost CommitDate: 2025-05-09 20:49:29 +0000 pfctl: rather than printing the wrong function name, dont print it at all found by Klemens Nanni Obtained from: OpenBSD, benno , 20d6a6e4d2 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index 6e0be926eff0..595f688d6139 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1126,7 +1126,7 @@ pfctl_show_eth_rules(int dev, char *path, int opts, enum pfctl_show format, if (anchorname[0] == '/') { if ((npath = calloc(1, MAXPATHLEN)) == NULL) - errx(1, "pfctl_rules: calloc"); + errx(1, "calloc"); snprintf(npath, MAXPATHLEN, "%s", anchorname); } else { if (path[0]) @@ -1242,7 +1242,7 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, if (anchorname[0] == '/') { if ((npath = calloc(1, MAXPATHLEN)) == NULL) - errx(1, "pfctl_rules: calloc"); + errx(1, "calloc"); strlcpy(npath, anchorname, MAXPATHLEN); } else { if (path[0]) @@ -1461,7 +1461,7 @@ pfctl_show_nat(int dev, const char *path, int opts, char *anchorname, int depth, } if ((npath = calloc(1, MAXPATHLEN)) == NULL) - errx(1, "pfctl_rules: calloc"); + errx(1, "calloc"); if (anchorname[0] == '/') { snprintf(npath, MAXPATHLEN, "%s", anchorname);