fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-09 15:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: nettools: drop useless "options" GHashTable checks

Browse source
This commit is contained in:
Francesco Giudici 2019-09-02 17:44:07 +02:00
parent 86973eae1f
commit 07b3ecbb7a
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dhcp/nm-dhcp-nettools.c
View file

@ -853,13 +853,10 @@ lease_parse_private_options (NDhcp4ClientLease *lease,
continue;
option_string = nm_utils_bin2hexstr_full (data, n_data, ':', FALSE, NULL);
if (options) {
nm_dhcp_option_take_option (options,
_nm_dhcp_option_dhcp4_options,
i,
g_steal_pointer (&option_string));
}
nm_dhcp_option_take_option (options,
_nm_dhcp_option_dhcp4_options,
i,
g_steal_pointer (&option_string));
}
}
@ -879,7 +876,7 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx,
g_return_val_if_fail (lease != NULL, NULL);
ip4_config = nm_ip4_config_new (multi_idx, ifindex);
options = out_options ? nm_dhcp_option_create_options_dict () : NULL;
options = nm_dhcp_option_create_options_dict ();
if (!lease_parse_address (lease, ip4_config, options, error))
return NULL;