From nobody Tue Nov 19 00:26:49 2024 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 4Xslfx6SLmz5dGLB; Tue, 19 Nov 2024 00:26:49 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xslfx52Psz4dK0; Tue, 19 Nov 2024 00:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976009; 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=EJ+BOwY1kZ9PUY6QXuIxIgLPI05OoqfKIMueiypHv4k=; b=DyM0bBBnAbKn7NF41qaB7D68+x6QRKyDeZF7jRsDniLONSVCB6ZfAL4P41UGgF0Qbd4n9R g4t/ACfDBdjQATXXj55QELEVFtdDUZLRnpV9WAUU3V6ayaiiE2nRoLyO9vb7dWsMF7nU1a C/TW9AEWXqjnOBDa9QAtDFJ4nKUWjn9+8zyLJMl7FOKVAXD4ClyN+WoBJ+FYi4UepoV1jL lnRZJC5UIo0I3ovjhgnoznxEPbp+wo4UHESTOmr0yWcPQ+cfE11B9lBk9fK3hHaAbL/y3a GJKBqq9uJNcbiscmCmTsVBWfihLV/jJWAE9Uz5z6bSz4X4l75HDZopkljfLhXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976009; 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=EJ+BOwY1kZ9PUY6QXuIxIgLPI05OoqfKIMueiypHv4k=; b=Vt95J2F8PDbFI1YI58SHz6XUU9+r2dJpkI26iy6dqB+QGkjBNi+Wxq2uQb7NnJWuhn/5M/ Q15ONrNjPK2stkt75vJg3asct7IwXtTni4jxWHb9ffcMINDFEi4lvwQ1gV5/vlnkyLhvlR +HV7OS5DK3b2jiXO2rJl0Y25Kw6tvYXY5xeTNrygOPBRa6lVMkqMCHle8NqwJXFtO5JUV/ kikFmTkF4Kd8Zs8cEkuORIWkpUsJtltZ8SVEhI5ybSYWdPz0JVt9WGrqb4xcOOhAkr18Jf g0RKTzNOiu8TwealXVBq62ZOThXKSYzqBngIrpH+/AkoltPPHvuZSqEwe43yLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731976009; a=rsa-sha256; cv=none; b=a1SJrKy/8qwMswB0AmjfKYIDjhxH/Le5OYJz3ncRqewGoDNXpUvgEM52u7PtH2uvTudygz qvhpS7+6lP0Al2WAfHuRAuCltROZYaiIL9hMH5bA7stGhT0R4aIdYSw5sF52KoPaD4cK6x NdYZBN6NDz/+XR45pUNAuGlGHXDmb9WjSL1SkWv+tjcqcwnJqbqDuUQr0sE3AcrvXg/zYM PRhsYcFMYuoTakAECVk3cZI21H+jbqT8edPepErMZ2dzVmJX8JyHzuiAbf5/wyY9VRKa2O 7IHHGKVFA/GihlcwLG/CKyiZjSeZTSNthZp37Fwk55UZo7VqpQ9pdJ1angB4ww== 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 4Xslfx4SrPz12w3; Tue, 19 Nov 2024 00:26:49 +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 4AJ0Qns7063810; Tue, 19 Nov 2024 00:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ0Qn2J063807; Tue, 19 Nov 2024 00:26:49 GMT (envelope-from git) Date: Tue, 19 Nov 2024 00:26:49 GMT Message-Id: <202411190026.4AJ0Qn2J063807@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: ced92eab36f3 - stable/14 - ipfilter: Close a bracket in the poolnode error message 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/14 X-Git-Reftype: branch X-Git-Commit: ced92eab36f37e4babacbee72e708af02af87a05 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ced92eab36f37e4babacbee72e708af02af87a05 commit ced92eab36f37e4babacbee72e708af02af87a05 Author: Cy Schubert AuthorDate: 2024-11-07 16:48:00 +0000 Commit: Cy Schubert CommitDate: 2024-11-19 00:26:05 +0000 ipfilter: Close a bracket in the poolnode error message When a node in a tree is discovered in error, i.e. duplicate, the IP address of the node is printed but no closing bracket completes the node in the message. Fix this. (cherry picked from commit 858a7a27f5c82c8364a0eb8bf1d9f0b1315422aa) --- sbin/ipf/libipf/load_poolnode.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sbin/ipf/libipf/load_poolnode.c b/sbin/ipf/libipf/load_poolnode.c index 7a01da9df94b..0e41a3921b71 100644 --- a/sbin/ipf/libipf/load_poolnode.c +++ b/sbin/ipf/libipf/load_poolnode.c @@ -57,6 +57,7 @@ load_poolnode(int role, char *name, ip_pool_node_t *node, int ttl, snprintf(msg, sizeof(msg), "%s pool(%s) node(%s/", what, name, inet_ntoa(pn.ipn_addr.adf_addr.in4)); strlcat(msg, inet_ntoa(pn.ipn_mask.adf_addr.in4), sizeof(msg)); + strcat(msg, ")"); return (ipf_perror_fd(pool_fd(), iocfunc, msg)); } }