From 35d4811ae45cc454c36636551c9aa8db0e40f72e Mon Sep 17 00:00:00 2001 From: Robert Love Date: Tue, 5 Jul 2005 15:06:48 +0000 Subject: [PATCH] 2005-07-05 Robert Love * src/NetworkManagerSystem.c: bail out if asked to set a gateway of zero. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@782 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/NetworkManagerSystem.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 565bcbadd2..b8e954333b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-07-05 Robert Love + + * src/NetworkManagerSystem.c: bail out if asked to set a gateway of + zero. + 2005-07-05 Robert Love * src/NetworkManagerDevice.c: use link-local (autoip) on DHCP failure diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c index 5de42ee0b6..24662b4591 100644 --- a/src/NetworkManagerSystem.c +++ b/src/NetworkManagerSystem.c @@ -732,6 +732,14 @@ static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const g_return_val_if_fail (iface != NULL, FALSE); + /* + * Zero is not a legal gateway and the ioctl will fail. But zero is a + * way of saying "no route" so we just return here. Hopefully the + * caller flushed the routes, first. + */ + if (ip4_gateway == 0) + return TRUE; + if ((sk = nm_dev_sock_open (dev, NETWORK_CONTROL, __FUNCTION__, NULL)) == NULL) return FALSE;