From nobody Sat Sep 28 08:49:17 2024 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 4XG1Gj4gZPz5Y13r; Sat, 28 Sep 2024 08:49: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XG1Gj3JNjz4m7t; Sat, 28 Sep 2024 08:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727513357; 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=umV9laZPhDpD2h8Aauu/lwqWLds7hpH2T+vVXx595Bc=; b=PD3nyO/7QukxH1/Kd5fCE43A/fidTyqWRNpGkF/ctkH+BbWm+04P7OelToW3ljozQq3biL DoDKlt+7+2w0M/CqRDoegFu+w5sq6AxQWut0yzsxbSfrfDTmgZfMYYg3GXZWVB2YbXPZtH m972vB/dMF0J9n9vZcmuCqoq4Tu6AjYMQxeXp3Rv7ML2ybR7/oh44hXN8R43U3deKLO3Dc zrcIL9/AdEFShwwpTqVOiF92opBbXIp//GCUrv+gTYdzvr92fvpOAEQauSb6exo+rf4jBi lWR0Mq0VrJS/8aN1qXuvK4gC0lKzm2lr8eJUEl8vSz0yuD86NK642dldbV4TbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727513357; 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=umV9laZPhDpD2h8Aauu/lwqWLds7hpH2T+vVXx595Bc=; b=oIwnPRJNQBws4ain3Rr1Ga/PDLJF5e5fuZwO4a5fNfCjktyAHGvrDjEXFIPWL3z9ocRSng ZDooshi0T7A6o8huJGMX8SR+IpnDXnjipTLLBU+hAx3pGi77MBo84odSbT8Hh/5eURUkMm GVPX8WRJEhbZcZg/hiIEc68amNF7Ib7RO5Vtou3ZZd8pc3h9udJUJHr06n+1A8C+8z25BX WLqwAewwyPuto0WO9rkNuUUktZfD8o2wKnKMm+dKuLLAY9x91cMk8NAlErRMoAFsva+CwA N5+DyBV+bbpTv5Zzsrl3Ce0FrwY9YhWM1CPr3aJ9ZSzlrZKfzQdk4CWAjSST/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727513357; a=rsa-sha256; cv=none; b=M07Liln2YH/mHWeuQs9tAaiaQdMEX4DNgHHGh3LLtrt48BibO4XpCUt7QkWz0G6Q+byQGt AwneE65go8udLkVqzhUYGR6MjYXtANwYVEI7ppscvPMC3DF/rtcSQPcrM8C9C8Q2soK/7x e9xU/S/kLh6wfUyuF4SY1rvCX74MtGrvteJGTJFo7nRfqrpzi27jNp+KeKOD5MXTqgWl+a kAbFWIygzYJAOxt7/WxbW8LXWFsOo8p5XsVulAnNhbtVlsIyMyUSfB1TMAHBD+m7pIZzPO NfhHbLbdyYmYHlht4F9xRk1XYNCw+Sm1lE1u8pjRgIJm+psXGBglRE76UQfFBA== 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 4XG1Gj2Z0FzJ0l; Sat, 28 Sep 2024 08:49: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 48S8nHWs009015; Sat, 28 Sep 2024 08:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48S8nHTo009012; Sat, 28 Sep 2024 08:49:17 GMT (envelope-from git) Date: Sat, 28 Sep 2024 08:49:17 GMT Message-Id: <202409280849.48S8nHTo009012@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Osipov Subject: git: 38c63b52830c - main - dhclient: Ignore vendor-identifying DHCP options defined in RFC 3925 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: michaelo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38c63b52830c85013f30bc62b2b32f3936d84e65 Auto-Submitted: auto-generated The branch main has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=38c63b52830c85013f30bc62b2b32f3936d84e65 commit 38c63b52830c85013f30bc62b2b32f3936d84e65 Author: Michael Osipov AuthorDate: 2024-09-23 12:37:34 +0000 Commit: Michael Osipov CommitDate: 2024-09-28 08:49:02 +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 --- 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. */