From 3cc0728228d1062903d73ffa899eb004f2f670d6 Mon Sep 17 00:00:00 2001
From: Ermal <eri@pfsense.org>
Date: Wed, 21 Jul 2010 20:24:13 +0000
Subject: Fixes #717. Actually if no default gateway is found assume wan is the
 one.

---
 etc/inc/system.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index 3166cd0..e7fc684 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -276,10 +276,10 @@ function system_routing_configure($interface = "") {
 
 	$gatewayip = "";
 	$interfacegw = "";
+	$foundgw = false;
 	/* tack on all the hard defined gateways as well */
 	if (is_array($config['gateways']['gateway_item'])) {
 		mwexec("/bin/rm {$g['tmp_path']}/*_defaultgw", true);
-		$foundgw = false;
 		foreach	($config['gateways']['gateway_item'] as $gateway) {
 			if (isset($gateway['defaultgw'])) {
 				if ($gateway['gateway'] == "dynamic")
@@ -295,13 +295,13 @@ function system_routing_configure($interface = "") {
 				break;
 			}
 		}
-		if ($foundgw == false) {
-			$defaultif = get_real_interface("wan");
-			$interfacegw = "wan";
-			$gatewayip = get_interface_gateway("wan");
-			@touch("{$g['tmp_path']}/{$defaultif}_defaultgw");
-		}	
 	}
+	if ($foundgw == false) {
+		$defaultif = get_real_interface("wan");
+		$interfacegw = "wan";
+		$gatewayip = get_interface_gateway("wan");
+		@touch("{$g['tmp_path']}/{$defaultif}_defaultgw");
+	}	
 	$dont_add_route = false;
 	/* if OLSRD is enabled, allow WAN to house DHCP. */
 	if($config['installedpackages']['olsrd']) {
@@ -1451,4 +1451,4 @@ function system_get_dmesg_boot() {
 	return file_get_contents("{$g['varlog_path']}/dmesg.boot");
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.1