fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-08 23:10:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: don't quit if we can't find a usable DHCP client (bgo #643575)

Browse source
This commit is contained in:
Dan Williams 2011-03-02 23:27:37 -06:00
parent 1a590cce13
commit eae0e8de61
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -317,11 +317,6 @@ nm_dhcp_manager_new (const char *client, GError **error)
{
NMDHCPManagerPrivate *priv;
DBusGConnection *g_connection;
GType client_type;
client_type = get_client_type (client, error);
if (!client_type)
return NULL;
g_warn_if_fail (singleton == NULL);
@ -329,13 +324,14 @@ nm_dhcp_manager_new (const char *client, GError **error)
priv = NM_DHCP_MANAGER_GET_PRIVATE (singleton);
/* Client-specific setup */
priv->client_type = client_type;
priv->client_type = get_client_type (client, error);
if (priv->client_type == NM_TYPE_DHCP_DHCLIENT)
priv->get_lease_config_func = nm_dhcp_dhclient_get_lease_config;
else if (priv->client_type == NM_TYPE_DHCP_DHCPCD)
priv->get_lease_config_func = nm_dhcp_dhcpcd_get_lease_config;
else
g_assert_not_reached ();
else {
nm_log_warn (LOGD_DHCP, "No usable DHCP client found! DHCP configurations will fail.");
}
priv->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal,
NULL,
@ -426,6 +422,9 @@ client_start (NMDHCPManager *self,
priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
/* Ensure we have a usable DHCP client */
g_return_val_if_fail (priv->client_type != 0, NULL);
/* Kill any old client instance */
client = get_client_for_iface (self, iface, ipv6);
if (client) {