From nobody Thu Mar 30 19:06:26 2023 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 4PnXvk4qhvz42C55; Thu, 30 Mar 2023 19:06:26 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PnXvk4Kvmz3MJm; Thu, 30 Mar 2023 19:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680203186; 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=Z0I7firGdyKdz2FBsGK7z+936z0h63BeXd5P6zU58mY=; b=B6WSSqrwFWV/lxN8Z2gErFWloyxMcX5IrsCjMYcc45+IbbBpE2YN9JGDnUN6VKYGHi++JD 9ZogO7mJsdlvX7s6GNQmz7xs2pxr2uxn5Y51jNZWhr+pFigHaFoDNCjrLC9Cdnv8ro6lRY 9OXMsoxsYAmbigW6iTg3ftoj7kqjP9iYMA/9Nsd1Q2sCgBkFtCYdq7JQbeJlWCK2C/H1t7 gpIzT+Ifh8ZIvsiU4nr/ljYR04Vjbx665lWM9CgnseilOUkIEhLBGNS14eeo0Bk0nPudC0 NvZJFeCB16dIPkRWeSZhEvHvR6AARIIX+vhtSA4W0OmvSJGG4kWLed0uq+djGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680203186; 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=Z0I7firGdyKdz2FBsGK7z+936z0h63BeXd5P6zU58mY=; b=lvYQlo2dwqwrRxxXKkUWH1tt81RB8xA07X5ecLoY/mP8ZoCX4aFo1NFCWO8A5oMFAB3WO1 kAfW0VWNv3ZyL5CEAx60x7TG2jsdWfW05phbiOdv/Nqiw+JprVrNSbNdOT0B/HIb2s5T7V hdhbFCMj96CJGOqacBrpcJmca7NQ15HzBC/NXtHngGXIRMXHwHy+yTwQGX8wnTENgln1Lw MKeamn8i9PTiifR18o1Sljujcfp2SPqcCR3wYBiNfGg7nwT1SiBPeiA+fyKZ0n6kkRUmLz HYx+Qg1hzjAdaBBjf83Z/bgDFOf0ZDSxiRDGfRkHbLpV4owCwuybsKi2yzvL4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680203186; a=rsa-sha256; cv=none; b=CALJCYB2+IbkY71zurNG/aA8FyGbX15U0yt98bey+6eo0amoEjUHtAbaMkUreAHcXBj5Td WG16Vl6STK8u7t6CpSKnsnLhgDRHvUsqyCMwZPl9ucgJ8NeXhTeqY7kwcc72ygCx0efqpK 9SoAhUksIr8LQaGjsdS8Ul+Yv/9ygi4xe/KgWC17qz0z5U4VGwsJPPXLXuXmUVWPs/gR64 O+kW9f5KKxFQmGd4LjCjGcAv+SUYlaQPNghKC14vpRgrh86n6cKSzhrFWE8NcxgOX/CrAO P+Ru+QBtRQ4U8D3VAJn9XHxMexI5FjC2doo6hmE6ZPXCrohw8EOfO7xTUegOrg== 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 4PnXvk3NW2zP3r; Thu, 30 Mar 2023 19:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32UJ6QZ8024038; Thu, 30 Mar 2023 19:06:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32UJ6Q1R024037; Thu, 30 Mar 2023 19:06:26 GMT (envelope-from git) Date: Thu, 30 Mar 2023 19:06:26 GMT Message-Id: <202303301906.32UJ6Q1R024037@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Mingrone Subject: git: 0c59e0b4e581 - main - pflogd: Do not access obsolete structure member pcap.tzoff 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c59e0b4e5817f139ce28486085b2f196351c7a3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/src/commit/?id=0c59e0b4e5817f139ce28486085b2f196351c7a3 commit 0c59e0b4e5817f139ce28486085b2f196351c7a3 Author: Joseph Mingrone AuthorDate: 2023-03-30 16:18:28 +0000 Commit: Joseph Mingrone CommitDate: 2023-03-30 18:58:45 +0000 pflogd: Do not access obsolete structure member pcap.tzoff This change is in preparation for a libpcap update. See also: https://github.com/the-tcpdump-group/libpcap/commit/d4d65e7c4c0a6233784b346dcb0ebb7e23a3feaa Reviewed by: emaste Sponsored by: The FreeBSD Foundation --- contrib/pf/pflogd/pflogd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/pf/pflogd/pflogd.c b/contrib/pf/pflogd/pflogd.c index de8d4acfa585..2b1b0df769a7 100644 --- a/contrib/pf/pflogd/pflogd.c +++ b/contrib/pf/pflogd/pflogd.c @@ -375,7 +375,7 @@ try_reset_dump(int nomove) hdr.magic = TCPDUMP_MAGIC; hdr.version_major = PCAP_VERSION_MAJOR; hdr.version_minor = PCAP_VERSION_MINOR; - hdr.thiszone = hpcap->tzoff; + hdr.thiszone = 0; hdr.snaplen = hpcap->snapshot; hdr.sigfigs = 0; hdr.linktype = hpcap->linktype;