diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-01-26 15:40:32 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-01-26 15:40:32 +0100 |
| commit | 9740fad81dce0f9389f157ac739473d17ad67839 (patch) | |
| tree | c71eeae7d425f0bc7c42ded5b9dcbb904a44cce5 /etc/inc/system.inc | |
| parent | 2259901018552f8a8432e295b8d6064fa918cda0 (diff) | |
| parent | ee4fc984e1169a180457b3a10e011fab04fd0f31 (diff) | |
| download | pfsense-9740fad81dce0f9389f157ac739473d17ad67839.zip pfsense-9740fad81dce0f9389f157ac739473d17ad67839.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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 395aa3a..4403c6f 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -444,6 +444,9 @@ function system_routing_configure($interface = "") { continue; } $gateway = $gateways_arr[$rtent['gateway']]; + if (!empty($interface) && $interface != $gateway['friendlyiface']) + continue; + $gatewayip = $gateway['gateway']; $interfacegw = $gateway['interface']; $action = "add"; @@ -840,7 +843,7 @@ function system_generate_lighty_config($filename, if($captive_portal == true) { $captiveportal = ",\"mod_rewrite\""; $captive_portal_rewrite = "url.rewrite-once = ( \"(.*captiveportal.*)\" => \"$1\", \"(.*)\" => \"/index.php?redirurl=$1\" )\n"; - $captive_portal_module = "\"mod_accesslog\", "; + $captive_portal_module = ""; $maxprocperip = $config['captiveportal']['maxprocperip']; if(!$maxprocperip and $maxprocperip > 0) $captive_portal_mod_evasive = "evasive.max-conns-per-ip = {$maxprocperip}"; |
