From nobody Tue Nov 19 00:28:17 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 4Xslhd2zNRz5dGHZ; Tue, 19 Nov 2024 00:28:17 +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 4Xslhd2M0tz4gDk; Tue, 19 Nov 2024 00:28:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976097; 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=2eCWmIVbjyUuj9lO7FOu2zHrbsk6FlNfb4owLnn9VZY=; b=UhFHDZ99EkD8hf2RhBoXh/DgfQFvuM15iAKHqdcfhO7y8NrfOD7+nm/Mnok1XbT1gpxWzI vBMBRlOs/il8r+0JHalxwlJESPHloXK7et020dF+vszfdxHyqyEInZj56eST80cz23U35W mJ1EcfI7Juv6Eu8GXH3xVZAeLAUMsWAOjCBycdhzFCc8qIzrtbb5Lw66TZHCetTsCBi+Xq h/UL5evrKudi0HB+/hAtggZ0KOCNBggVSpIcWOXUoLVfnvztS46pka+luimusxBPSzbblu +Mcs6LVV6vzRTy5sHgdtFn/QvO0vKFXnC5voUSp+pm8A6ZpyDHCLeWHVdCNbqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731976097; 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=2eCWmIVbjyUuj9lO7FOu2zHrbsk6FlNfb4owLnn9VZY=; b=eTGauzUYun1NMuvSSPOqMo5TPUgNz/mt+wjXRhF/EOJI8bG/n+WqJnz0QgHGdK7j150e+2 A3Mbu3YTnJlKBGojcWJGFopVyfdkGFPoB26lJMRRn5TwUzBBDArZVtsDaMxr6l179J/Mw8 GYgMpXuEvN3AciY+jpQiVUDDeL89oC/F7ZveIP0FZegNvKec62IvRojM6YUd5RYf6I5E7B tLHHljHQWxWcmpdjf5NY7u3xYTn+EWiIMN3BX7P0SpMPLOxc4ySuBRtu/FIigSmpcnLZuR ZPh0EoywyKZFFqkDLFcykgV4NSi8JH6KXubNJ0/1zswUFoVEqURvG+7CPfvBZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731976097; a=rsa-sha256; cv=none; b=VnTlf0VHpZT3fMj0fxwoKZ1Hv8jiazHs2l0W/hkMwf352dw/Jbjq7tUicaWmjp17f7D1F0 1LzDm0I7pqDwK9708ferL6dufL7/hkbteu7NTgizxM2LUc5G5pgLU9q0YfhnPi3L86YOkL 1dYGk6Ube49b4gX+Wo9VdQ0MpbUMhdQ/3Io9WP6e8trENKcMJyad2oibcJ62xDJi0HfAuU rqelHwy1PnpEUSrWqTb5bBk6PnwcRTbq9NYMGS66rMZoh19gzuEyCWW+WZ+s2h+cKaW5/w QHSM27ViNuPftNThQWgDUtlhkrjWAJR4srsUIsgJVxg6FjuGlUvNv+EHnkAgVQ== 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 4Xslhd1xrhz12w5; Tue, 19 Nov 2024 00:28:17 +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 4AJ0SHHQ064778; Tue, 19 Nov 2024 00:28:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJ0SHg2064775; Tue, 19 Nov 2024 00:28:17 GMT (envelope-from git) Date: Tue, 19 Nov 2024 00:28:17 GMT Message-Id: <202411190028.4AJ0SHg2064775@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: 0195893f9408 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 0195893f9408e043505dd8599ebbcbc8e843c302 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=0195893f9408e043505dd8599ebbcbc8e843c302 commit 0195893f9408e043505dd8599ebbcbc8e843c302 Author: Cy Schubert AuthorDate: 2024-11-07 16:48:00 +0000 Commit: Cy Schubert CommitDate: 2024-11-19 00:27:07 +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)); } }