From nobody Sat Oct 12 12:11:15 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 4XQj5J0QnWz5ZHKZ; Sat, 12 Oct 2024 12:11:16 +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 4XQj5H722Yz4f4Q; Sat, 12 Oct 2024 12:11:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728735076; 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=TA1/TCj5WY5RJaa01ipqtghNYGDIKHHVoAyhBzO+o4I=; b=Hlh1tI+2rnvcb2dQmXrt0aUj30cc18X/oBTkpvDly8qdSWbr5t1oWC4D/NO9bZJB4DKyfc g5aRCHiCZgwol28EJx/rYqroPeuw18ubeLN9Wds8KeRWXF56HeU3yllQxOU+0MRL9x/W3i T+5nodjGqOJkORpfBylrOvNz442VmR+w6B6tiu8tErwdS3YonqOC6WC/ZIFuwMBNcTUEsz hmdpP7LWOSPfdsLexDOLMgkfQ5OCbxW3a/Roh0XN/PNLeKK0CjzdU9FK329DK9isoe12mv YdsgThMeb3W8aXwsn7bDbyYnwPfYsRjr8JS0kUXJAmzF9dsFyw38Ma1iwhrCHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728735076; 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=TA1/TCj5WY5RJaa01ipqtghNYGDIKHHVoAyhBzO+o4I=; b=rGZIxleZwE6f0N83KS5aa+fVzn+WLBRX5uJJ9GVOQyXbFLkr9JOm6PF7z8aVFaDwmzD9iN INGJOP7HJJdYZfIK2nL9JopqW+5OeFQGMgXtfHvxvSMpzEuXxUGSo6vpJOXv7Kf5DLRFN0 28Y4rnfb6dRD92Q3ckny/67i4bp5hxQRfkCTf48UKOcw6kk8z8GtB6AFeoELPFN07tF97X 8kWfxbaCzMJ01jn2AMNe2YY1vOdGXBdq0jVGu4RUaXRVBVrOiMdIHVMHbVPlBzp2SSHk7w xJCYJE7GVuwsOQzMVNpi3AIPlIs+JSbR+07erRjBEW9Lu14mG4LICn30Ah1Aqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728735076; a=rsa-sha256; cv=none; b=FT+7nrDw+Jq3ywqgMJMK1iori/o+XDjH4oolL6a+xTs3YAXXdUxAfNm8gdODhcJFxjVL/h +aU1YQW6rnWRG5LEihYgQ5R7zmIXcs4fV4eudBalu60gj7jW9cYYsK/3jQ6SHFEN8CBDP4 e7wM9zQnPmKUcufl5nF9tvWfMhbSP5yu2JqIH4V1bShpXyf+A/hkrRBQBPjhJq0Xz3OlAm G9xTU6rYgplq7bbTA+nauqYlU1jkzuJjRzwCqd/8asaAmve7GPoEDfQ9hkY7wk50OM7Wvs GJgKdUTSCcGOyGWJH1OahtHuCGwS5G2c+xIopewTQQBxZXUtJkDzwNRKf3YZig== 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 4XQj5H6Wvyz1NKv; Sat, 12 Oct 2024 12:11:15 +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 49CCBFiZ052924; Sat, 12 Oct 2024 12:11:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CCBFLS052921; Sat, 12 Oct 2024 12:11:15 GMT (envelope-from git) Date: Sat, 12 Oct 2024 12:11:15 GMT Message-Id: <202410121211.49CCBFLS052921@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Osipov Subject: git: 36c370fa3e97 - stable/14 - dhclient: Ignore vendor-identifying DHCP options defined in RFC 3925 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 36c370fa3e9750543b447e9efdcbe83463836388 Auto-Submitted: auto-generated The branch stable/14 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=36c370fa3e9750543b447e9efdcbe83463836388 commit 36c370fa3e9750543b447e9efdcbe83463836388 Author: Michael Osipov AuthorDate: 2024-09-23 12:37:34 +0000 Commit: Michael Osipov CommitDate: 2024-10-12 12:11:04 +0000 dhclient: Ignore vendor-identifying DHCP options defined in RFC 3925 Ignore DHCP options 124 and 125 to shut up the warning messages. These options are defined in the RFC 3925. PR: 281361 Reviewed by: jrm (mentor), otis (mentor), thj Tested by: jlduran@gmail.com MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D46760 (cherry picked from commit 38c63b52830c85013f30bc62b2b32f3936d84e65) --- sbin/dhclient/dhclient.c | 2 ++ sbin/dhclient/dhcp.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c index 4a674cec5888..93988d5ce7a4 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2641,6 +2641,8 @@ check_option(struct client_lease *l, int option) case DHO_DHCP_USER_CLASS_ID: case DHO_URL: case DHO_SIP_SERVERS: + case DHO_V_I_VENDOR_CLASS: + case DHO_V_I_VENDOR_OPTS: case DHO_END: return (1); case DHO_CLASSLESS_ROUTES: diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h index 99b69613934f..02ea42a66079 100644 --- a/sbin/dhclient/dhcp.h +++ b/sbin/dhclient/dhcp.h @@ -174,6 +174,8 @@ struct dhcp_packet { #define DHO_DOMAIN_SEARCH 119 #define DHO_SIP_SERVERS 120 #define DHO_CLASSLESS_ROUTES 121 +#define DHO_V_I_VENDOR_CLASS 124 +#define DHO_V_I_VENDOR_OPTS 125 #define DHO_END 255 /* DHCP message types. */