diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:59:29 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-03-25 08:59:29 -0300 |
| commit | 152ab4d0c036889d5d983cef0f612c2dcf211e7b (patch) | |
| tree | 2120aa2834d2b0218a8bede4629aaac4acfbd5ec /etc/inc/interfaces.inc | |
| parent | 54bdff758f68e2e1b1ebd42b8b0b629b68ed1a3d (diff) | |
| parent | d93ee937f2305f06148d972be92224a2a52ba9e5 (diff) | |
| download | pfsense-152ab4d0c036889d5d983cef0f612c2dcf211e7b.zip pfsense-152ab4d0c036889d5d983cef0f612c2dcf211e7b.tar.gz | |
Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
etc/inc/interfaces.inc
etc/inc/priv.defs.inc
etc/inc/shaper.inc
etc/inc/system.inc
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e678b3b..02eadf4 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1215,8 +1215,8 @@ function interface_ppps_configure($interface) { $localips[$pid] = get_interface_ip($port); // try to get the interface IP from the port if(!is_ipaddr($localips[$pid])){ - log_error(sprintf(gettext("Could not get a Local IP address for PPTP/L2TP link on %s in interfaces_ppps_configure."), $port)); - return 0; + log_error("Could not get a Local IP address for PPTP/L2TP link on {$port} in interfaces_ppps_configure. Using 0.0.0.0 ip!"); + $localips[$pid] = "0.0.0.0"; } /* XXX: This needs to go away soon! [It's commented out!] */ /* Configure the gateway (remote IP ) */ @@ -1492,7 +1492,6 @@ EOD; $mpdconf .= <<<EOD set {$type} self {$localips[$pid]} set {$type} peer {$gateways[$pid]} - set {$type} disable windowing EOD; } |
