fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 09:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhclient: write client-id with backslash and quotes as hex

Browse source
This commit is contained in:
Beniamino Galvani 2018-03-06 14:13:40 +01:00
parent 8ffa22d10d
commit 0e4b33ee75
2 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ add_ip4_config (GString *str, GBytes *client_id, const char *hostname, gboolean
* as long as all the characters are printable.
*/
for (i = 1; (p[0] == 0) && i < l; i++) {
if (!g_ascii_isprint (p[i]))
if (!g_ascii_isprint (p[i]) || p[i] == '\\' || p[i] == '"')
break;
}

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

@ -180,6 +180,35 @@ test_quote_client_id (void)
/*****************************************************************************/
static const char *quote_client_id_expected_2 = \
"# Created by NetworkManager\n"
"\n"
"send dhcp-client-identifier 00:61:5c:62:63; # added by NetworkManager\n"
"\n"
"option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;\n"
"option ms-classless-static-routes code 249 = array of unsigned integer 8;\n"
"option wpad code 252 = string;\n"
"\n"
"also request rfc3442-classless-static-routes;\n"
"also request ms-classless-static-routes;\n"
"also request static-routes;\n"
"also request wpad;\n"
"also request ntp-servers;\n"
"\n";
static void
test_quote_client_id_2 (void)
{
test_config (NULL, quote_client_id_expected_2,
AF_INET, NULL, 0, FALSE,
"a\\bc",
NULL,
"eth0",
NULL);
}
/*****************************************************************************/
static const char *hex_zero_client_id_expected = \
"# Created by NetworkManager\n"
"\n"
@ -1100,7 +1129,8 @@ main (int argc, char **argv)
g_test_add_func ("/dhcp/dhclient/orig_missing", test_orig_missing);
g_test_add_func ("/dhcp/dhclient/override_client_id", test_override_client_id);
g_test_add_func ("/dhcp/dhclient/quote_client_id", test_quote_client_id);
g_test_add_func ("/dhcp/dhclient/quote_client_id/1", test_quote_client_id);
g_test_add_func ("/dhcp/dhclient/quote_client_id/2", test_quote_client_id_2);
g_test_add_func ("/dhcp/dhclient/hex_zero_client_id", test_hex_zero_client_id);
g_test_add_func ("/dhcp/dhclient/ascii_client_id", test_ascii_client_id);
g_test_add_func ("/dhcp/dhclient/hex_single_client_id", test_hex_single_client_id);