diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-20 09:03:06 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-20 09:03:06 +0100 |
| commit | d2619fa0fada68cc7b38f826b0d4b772a4eaf413 (patch) | |
| tree | 8d9ad54a06ba38eec5021f6b9ebaf08d82d6f877 /etc/inc/system.inc | |
| parent | 2db19fec13247fa12d1d2e4db5e545388031bab5 (diff) | |
| parent | 86ae36217b8baad3cfb331705fc391cf176be076 (diff) | |
| download | pfsense-d2619fa0fada68cc7b38f826b0d4b772a4eaf413.zip pfsense-d2619fa0fada68cc7b38f826b0d4b772a4eaf413.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/system.inc
Diffstat (limited to 'etc/inc/system.inc')
| -rw-r--r-- | etc/inc/system.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 4a7f0ed..520fd01 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -331,6 +331,8 @@ function system_routing_configure($interface = "") { mwexec("/bin/rm {$g['tmp_path']}/*_defaultgw", true); foreach ($config['gateways']['gateway_item'] as $gateway) { if (isset($gateway['defaultgw']) && (is_ipaddrv4($gateway['gateway']))) { + if(strstr($gateway['gateway'], ":")) + break; if ($gateway['gateway'] == "dynamic") $gateway['gateway'] = get_interface_gateway($gateway['interface']); $gatewayip = $gateway['gateway']; @@ -442,7 +444,7 @@ function system_routing_configure($interface = "") { continue; } $gateway = $gateways_arr[$rtent['gateway']]; - if ($interface == $gateway['friendlyiface']) + if ($interface != $gateway['friendlyiface']) continue; $gatewayip = $gateway['gateway']; $interfacegw = $gateway['interface']; |
