system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-18 15:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

dhcp: make sure disabled DHCP clients aren't used (gentoo #330319)

Browse source 
If the client was disabled with --with-dhclient=no or
--with-dhcpcd=no, then it's corresponding _PATH will be an empty
string.  In that case we want to ignore that client completely
since it was disabled at build time.
This commit is contained in:
Dan Williams 2010-08-05 15:25:42 -05:00
parent 91e90d9d54
commit c050e036c3
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -265,8 +265,13 @@ get_client_type (const char *client, GError **error)
const char *dhclient_path = NULL;
const char *dhcpcd_path = NULL;
dhclient_path = nm_dhcp_dhclient_get_path (DHCLIENT_PATH);
dhcpcd_path = nm_dhcp_dhcpcd_get_path (DHCPCD_PATH);
/* If a client was disabled at build-time, its *_PATH define will be
* an empty string.
*/
if (DHCLIENT_PATH && strlen (DHCLIENT_PATH))
dhclient_path = nm_dhcp_dhclient_get_path (DHCLIENT_PATH);
if (DHCPCD_PATH && strlen (DHCPCD_PATH))
dhcpcd_path = nm_dhcp_dhcpcd_get_path (DHCPCD_PATH);
if (!client) {
if (dhclient_path)