git: 954692a14402 - stable/14 - dhclient: Ignore SIP servers DHCP option defined in RFC 3361

From: Michael Osipov <michaelo_at_FreeBSD.org>
Date: Mon, 29 Jul 2024 06:20:07 UTC
The branch stable/14 has been updated by michaelo:

URL: https://cgit.FreeBSD.org/src/commit/?id=954692a144026860579cc525b5aa824b75719d6a

commit 954692a144026860579cc525b5aa824b75719d6a
Author:     Yuichiro NAITO <naito.yuichiro@gmail.com>
AuthorDate: 2024-07-04 07:57:02 +0000
Commit:     Michael Osipov <michaelo@FreeBSD.org>
CommitDate: 2024-07-29 06:19:41 +0000

    dhclient: Ignore SIP servers DHCP option defined in RFC 3361
    
    Ignore SIP servers dhcp option to shut up the warning message.
    This option is defined in the RFC 3361 and sent from NSD-G1000T router.
    
    PR:             280119
    Reviewed by:    jrm (mentor), brooks
    MFC after:      2 weeks
    Differential Revision:  https://reviews.freebsd.org/D45873
    
    (cherry picked from commit ac6dc5cde729a602252a0b80f82424861d2eb7b5)
---
 sbin/dhclient/dhclient.c | 1 +
 sbin/dhclient/dhcp.h     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 8179a5c34209..62e55eb4d01f 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -2618,6 +2618,7 @@ check_option(struct client_lease *l, int option)
 	case DHO_BOOTFILE_NAME:
 	case DHO_DHCP_USER_CLASS_ID:
 	case DHO_URL:
+	case DHO_SIP_SERVERS:
 	case DHO_END:
 		return (1);
 	case DHO_CLASSLESS_ROUTES:
diff --git a/sbin/dhclient/dhcp.h b/sbin/dhclient/dhcp.h
index 300deb464238..99b69613934f 100644
--- a/sbin/dhclient/dhcp.h
+++ b/sbin/dhclient/dhcp.h
@@ -172,6 +172,7 @@ struct dhcp_packet {
 #define DHO_DHCP_USER_CLASS_ID		77
 #define	DHO_URL				114
 #define	DHO_DOMAIN_SEARCH		119
+#define DHO_SIP_SERVERS			120
 #define DHO_CLASSLESS_ROUTES		121
 #define DHO_END				255