From 135da08fc54f57cd959e5f65ecf4025503eede69 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 18 Jan 2006 02:27:38 +0000 Subject: [PATCH] 2006-01-17 Dan Williams * src/nm-device.c - (nm_device_class_init): connect a default act_stage4_ip_config_timeout function. Fixes crash when wired DHCP fails. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1355 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ src/nm-device.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e6938ead7e..dd9049e1e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-17 Dan Williams + + * src/nm-device.c + - (nm_device_class_init): connect a default act_stage4_ip_config_timeout + function. Fixes crash when wired DHCP fails. + 2006-01-16 Robert Love * src/Makefile.am: Don't install NMLoadModules diff --git a/src/nm-device.c b/src/nm-device.c index 4e4d3cd278..d639506185 100644 --- a/src/nm-device.c +++ b/src/nm-device.c @@ -1111,7 +1111,7 @@ nm_device_activate_stage4_ip_config_timeout (NMActRequest *req) NMDevice * self = NULL; NMIP4Config * ip4_config = NULL; const char * iface; - NMActStageReturn ret; + NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE; g_return_val_if_fail (req != NULL, FALSE); @@ -1964,6 +1964,7 @@ nm_device_class_init (NMDeviceClass *klass) klass->act_stage2_config = real_act_stage2_config; klass->act_stage3_ip_config_start = real_act_stage3_ip_config_start; klass->act_stage4_get_ip4_config = real_act_stage4_get_ip4_config; + klass->act_stage4_ip_config_timeout = real_act_stage4_ip_config_timeout; g_type_class_add_private (object_class, sizeof (NMDevicePrivate)); }