From nobody Thu Jul 3 12:01:11 2025 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 4bXwMr1HBjz60qXX; Thu, 03 Jul 2025 12:01:12 +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 4bXwMq6PN7z3mcw; Thu, 03 Jul 2025 12:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751544071; 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=djP7JmrHQjTCTNh1zCf0yX7+65FBjGtOnj2M1Oa+SRk=; b=AghRiX8bMSa9nYRJyxVfzqocgqCrC3tLHYVUiG+RNTcsGzaF9jr3w6IPt7gVb0leP15q31 NaYMHX8qzVvEX3CadgCPHfWulbKHjr4071nTant5ujYksuPpulLTqlOIPSEfh8Vy9lfr1d TLxxHWux9cadr/IzOvzeLgdW4Y8a17sgSG7odjTGJHY+lzncSoJSoik0ga9cauoxMoubwl mrla2TFhZgfX6SAIqbdBbcv29Tv3O2o8ziIewXFXim+P6tdEEhnP5e4Jcflu5yU0OpGKqX wMdLeBtZzxfVan/UC//UrBQihbaqe8jOavOki3XZYASnk7XAsVoQsyrx9Zi/bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751544071; 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=djP7JmrHQjTCTNh1zCf0yX7+65FBjGtOnj2M1Oa+SRk=; b=C82DF2BpB5h0GdEvDbU8UT+uahCV01/SjjgoJ9noOcmBW5YIheZ+YhWA3AIHTtbGb4/2Le ayYHhDgwLSRB6qjHqQGovKX/ZC9S5R0bqNv/lpdix35r2bJdR/2rJqYuJ8Ff1jxuafwiys seyqnzmZTEquOdwGdBX7vyBFVrnyWGIgnqRFhrlqZDnYRM58AkJEHpnXIT0kjzY7/Q0fF0 Vcp8rIRY2okWkIE6b6FVAdhJhROZEsmYbG/VGIuXlaJkmUKXrPLjr0L82DoqQ1K8o7Kk2X QGrULLS/55D41yzqhmX01EooWaoKpIGlC9u+vtGlMIXWWBG+goq/CA8UvxR6yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751544071; a=rsa-sha256; cv=none; b=FvHTKWXEBuAN6O3DMSHWFaH7+Mcy7VJT7flYK9J5qFFYKUwN7JTOGNCSjC3/kmfLyHEngQ rm8uhWBaC0sBuScZBzwST91dO+oMnY9NEod6cPHECwDlCl3rBAeSScoa/ZCL07yuKFbIRH 74AzSSVn6b9N6KIMqci7l75Nhd17XT+ndIRLqeQZgBs9u8oGkjCj9Np9QWaMFJ82B0JWr2 vyDQYbdeXPCdG3lmxj9xiyB9H0RBAM6GS38b+cFpLoGtu8lZKLGpOxWFEyxDrdZGKFZJ6x b3iJBZ0ngr9gwcA03uFNCG1XLbW38LTMizvYqEgvcjpgW0aJh1JxnQugypXGww== 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 4bXwMq5wfNz13xX; Thu, 03 Jul 2025 12:01:11 +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 563C1BoJ052081; Thu, 3 Jul 2025 12:01:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 563C1BMW052078; Thu, 3 Jul 2025 12:01:11 GMT (envelope-from git) Date: Thu, 3 Jul 2025 12:01:11 GMT Message-Id: <202507031201.563C1BMW052078@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: e98d6da4ddf0 - main - pfctl: Avoid unneeded variable in gen_dynnode() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: e98d6da4ddf0c1cd2bec83a27abe7590289632f1 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e98d6da4ddf0c1cd2bec83a27abe7590289632f1 commit e98d6da4ddf0c1cd2bec83a27abe7590289632f1 Author: Kristof Provost AuthorDate: 2025-06-27 15:17:44 +0000 Commit: Kristof Provost CommitDate: 2025-07-03 07:16:14 +0000 pfctl: Avoid unneeded variable in gen_dynnode() OK bluhm Obtained from: OpenBSD, kn , 9e1cf8ac88 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pfctl_parser.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index de3048b27a47..dfcf1a7b62a0 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1387,7 +1387,6 @@ struct node_host * gen_dynnode(struct node_host *h, sa_family_t af) { struct node_host *n; - struct pf_addr *m; if (h->addr.type != PF_ADDR_DYNIFTL) return (NULL); @@ -1400,8 +1399,7 @@ gen_dynnode(struct node_host *h, sa_family_t af) n->tail = NULL; /* fix up netmask */ - m = &n->addr.v.a.mask; - if (af == AF_INET && unmask(m) > 32) + if (af == AF_INET && unmask(&n->addr.v.a.mask) > 32) set_ipmask(n, 32); return (n);