From 6f66ff845ffb8f5674aa2aec434af88566e76a0a Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 17 Jan 2020 10:29:49 +0100 Subject: [PATCH] dhcp: don't add server-id option to the parameter request list The option is mandatory in the replies from server and so we don't need to ask for it. dhclient doesn't do it either. But especially, it seems that requesting the option causes some broken server implementations to send duplicate instances of the option. So, remove the option from the parameter request list of the internal nettools and systemd DHCP implementation. (cherry picked from commit 541db78259063b1bef10071449ebddfbac1fe519) --- src/dhcp/nm-dhcp-options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dhcp/nm-dhcp-options.c b/src/dhcp/nm-dhcp-options.c index 4c003f315c..1d391f3e9c 100644 --- a/src/dhcp/nm-dhcp-options.c +++ b/src/dhcp/nm-dhcp-options.c @@ -34,7 +34,7 @@ const NMDhcpOption _nm_dhcp_option_dhcp4_options[] = { REQ (NM_DHCP_OPTION_DHCP4_NIS_DOMAIN, "nis_domain", TRUE ), REQ (NM_DHCP_OPTION_DHCP4_NIS_SERVERS, "nis_servers", TRUE ), REQ (NM_DHCP_OPTION_DHCP4_NTP_SERVER, "ntp_servers", TRUE ), - REQ (NM_DHCP_OPTION_DHCP4_SERVER_ID, "dhcp_server_identifier", TRUE ), + REQ (NM_DHCP_OPTION_DHCP4_SERVER_ID, "dhcp_server_identifier", FALSE ), REQ (NM_DHCP_OPTION_DHCP4_DOMAIN_SEARCH_LIST, "domain_search", TRUE ), REQ (NM_DHCP_OPTION_DHCP4_PRIVATE_CLASSLESS_STATIC_ROUTE, "ms_classless_static_routes", TRUE ), REQ (NM_DHCP_OPTION_DHCP4_PRIVATE_PROXY_AUTODISCOVERY, "wpad", TRUE ),