2005-08-11 Dan Williams <dcbw@redhat.com>

	* src/nm-dhcp-manager.c
		- (nm_dhcp_manager_get_ip4_config): if for some reason we don't get
			an gateway returned from DHCP, try to use the address of the DHCP
			server as the gateway instead.  Found by Ralf Ertzinger.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@834 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

ChangeLog

+2005-08-11  Dan Williams  <dcbw@redhat.com>
+
+	* src/nm-dhcp-manager.c
+		- (nm_dhcp_manager_get_ip4_config): if for some reason we don't get
+			an gateway returned from DHCP, try to use the address of the DHCP
+			server as the gateway instead.  Found by Ralf Ertzinger.
+
 2005-08-10  Robert Love  <rml@novell.com>
 
 	* gnome/applet/applet.c: Make applet->dbus_thread joinable so we can

src/dhcp-manager/nm-dhcp-manager.c

@@ -479,7 +479,11 @@ NMIP4Config * nm_dhcp_manager_get_ip4_config (NMDHCPManager *manager, NMActReque
 		goto out;
 
 	if (!get_ip4_uint32s (manager, dev, "routers", &ip4_gateway, &count) || !count)
-		goto out;
+	{
+		/* If DHCP doesn't have a 'routers', just use the DHCP server's address as our gateway for now */
+		if (!get_ip4_uint32s (manager, dev, "dhcp_server_identifier", &ip4_gateway, &count) || !count)
+			goto out;
+	}
 
 	if (!get_ip4_uint32s (manager, dev, "domain_name_servers", &ip4_nameservers, &num_ip4_nameservers) || !num_ip4_nameservers)
 		goto out;