From nobody Sat Oct 12 12:15:23 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 4XQjB327KWz5ZHnZ; Sat, 12 Oct 2024 12:15:23 +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 4XQjB31QFhz4fSZ; Sat, 12 Oct 2024 12:15:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728735323; 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=2jWXZ/bLTbGhrnGeMOdkxugoD6pPpFMdMi/+H+x5ayY=; b=bY+EjOJRauLXnEOWtoEfgFqUCPGMlKrGkCnv49BJHGdISG4WdyKa3+u2Af4mL4o45Kbw6X N1n2FzdZwhWjavtNhh8pZ94RBXLM8BEREZtK2K/N15jNVKQwBqe0E56dott3/XbQmBJcyQ 4RyDwL2N353ZJPCW0scZjHkeYOx2cSEnA7OhgFnFz05+Ug5u8B/eoCwJouavAbBL5E0XBU ZKpSogt+WLnXZwcCaaSNPBMLIeurgy+BhnySw/0tJLjF4TSnbwX590OzHP2IcBVtYWyCge uVWZudzJ/oWHLyrdd2pEB2bhtiYutPg3V34VudXFeWTH+rKl9VJJgeInmBPSXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728735323; 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=2jWXZ/bLTbGhrnGeMOdkxugoD6pPpFMdMi/+H+x5ayY=; b=PWKwfG/2uVn3GOSc23UklnXj6w8s0llo2591FfffFJjk6WBy+Z9FnNoEUEQTnI59nbTE/B ZaC02eeQvXkFdpUo6evdEWjGbelVqajw/4Vvs48lhN4WqGp0RnlSoAZex5A0I/lxuJpVPu QKPY07sVfU2USyHcoKFoM3vCpsNFnbnou+06QH6BVUojBSyv/q9VtweyNyr8NsjG30bzGk of3GM1iTMK9pWZIwIIuknOBtQzdiLEKrVR3WDBBWNbdVADFPsqnuqGln2o9emv5FHUAfFQ ZEh/0rMNgqPZtwTRRWLssfYkt5/aqb7KnJnG9MJSTqxee1UX5iaAVy+DrjSUDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728735323; a=rsa-sha256; cv=none; b=FGAVJHKMNCn6CIFcNJwv4CUarXsaci59nehXdaGM/QeIZps+deKJGcbsSvOlmibTMo3RJG WKe3quEA+XlrAQb77RMATw0+dlV3FcjO+8aKIBmPTOTfWpqqpFlFRe3kH2Qj8+8Ro8SJzB 97tCWXKx0OpJgd35kkfUaPfJIO7faZOROeuDDNpWzQoRh5y4lfg861fVwb//X9wDXnUbCt Yj3Q/SJOduWemKGIaabOCLVZ9slbRbpp/mer4Aa6vgLLzP0SAIrjffGn3Irm+nX+XKDwT4 tS246yXuatUPH28UgmwUyjXmOy91HTxrpV+1zwwcCs1zyGG0xeSuguHAm42iIg== 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 4XQjB312CZz1PLF; Sat, 12 Oct 2024 12:15:23 +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 49CCFNM0057649; Sat, 12 Oct 2024 12:15:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49CCFNIe057646; Sat, 12 Oct 2024 12:15:23 GMT (envelope-from git) Date: Sat, 12 Oct 2024 12:15:23 GMT Message-Id: <202410121215.49CCFNIe057646@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: 9525f5726a85 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 9525f5726a85c0e7f9fb2033add80cd51cce3844 Auto-Submitted: auto-generated The branch stable/13 has been updated by michaelo: URL: https://cgit.FreeBSD.org/src/commit/?id=9525f5726a85c0e7f9fb2033add80cd51cce3844 commit 9525f5726a85c0e7f9fb2033add80cd51cce3844 Author: Michael Osipov AuthorDate: 2024-09-23 12:37:34 +0000 Commit: Michael Osipov CommitDate: 2024-10-12 12:15:07 +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 576d7260086c..141403d8c86b 100644 --- a/sbin/dhclient/dhclient.c +++ b/sbin/dhclient/dhclient.c @@ -2632,6 +2632,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. */