git: 38c63b52830c - main - dhclient: Ignore vendor-identifying DHCP options defined in RFC 3925

The branch main has been updated by michaelo:

URL: https://cgit.FreeBSD.org/src/commit/?id=38c63b52830c85013f30bc62b2b32f3936d84e65

commit 38c63b52830c85013f30bc62b2b32f3936d84e65
Author:     Michael Osipov <michaelo@FreeBSD.org>
AuthorDate: 2024-09-23 12:37:34 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
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. */