system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 20:45:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: dhclient: remove fqdn.encoded for dhclient -6 conf

Browse source 
The option fqdn.encoded doesn't exist in DHCPv6, it's a DHCPv4 flag
only.
This commit is contained in:
Jonas Jonsson 2017-04-05 11:52:27 +02:00 committed by Beniamino Galvani
parent d68f84073b
commit fdf967592b
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dhcp/nm-dhcp-dhclient-utils.c
View file

@ -174,7 +174,6 @@ add_hostname6 (GString *str, const char *hostname)
if (hostname && strchr (hostname, '.')) {
g_string_append_printf (str, FQDN_FORMAT "\n", hostname);
g_string_append (str,
"send fqdn.encoded on;\n"
"send fqdn.server-update on;\n");
g_string_append_c (str, '\n');
}

1
src/dhcp/tests/test-dhcp-dhclient.c
View file

@ -417,7 +417,6 @@ static const char *override_hostname6_expected = \
"# Merged from /path/to/dhclient.conf\n"
"\n"
"send fqdn.fqdn \"blahblah.local\"; # added by NetworkManager\n"
"send fqdn.encoded on;\n"
"send fqdn.server-update on;\n"
"\n"
"also request dhcp6.name-servers;\n"