diff options
| author | Ermal <eri@pfsense.org> | 2014-08-13 11:52:28 +0200 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-08-13 11:52:28 +0200 |
| commit | 23ba08fc940b711f3b44551199890dc8e28a63b6 (patch) | |
| tree | 4b42f40750f633d96daad5f6348b6038387ab6ef /etc/inc/vpn.inc | |
| parent | 1c70bdff117f99f488de577cd276372293f9fa2f (diff) | |
| download | pfsense-23ba08fc940b711f3b44551199890dc8e28a63b6.zip pfsense-23ba08fc940b711f3b44551199890dc8e28a63b6.tar.gz | |
Revert "Fix assignment of tunnel IPs to mobile clients."
This normally is not needed since the attr plugin deals with all this.
This reverts commit 00311d6a841c0f6fc162ea11da06569f10220f5e.
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index d222622..ae14169 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -610,7 +610,6 @@ EOD; $left_spec = $ep; $ipseclifetime = 0; - $rightsourceip = NULL; $rightsubnet_spec = array(); $leftsubnet_spec = array(); $ealgoAHsp2arr = array(); @@ -662,10 +661,8 @@ EOD; if (!isset($ph2ent['mobile'])) { $rightsubnet_spec[] = ipsec_idinfo_to_cidr($ph2ent['remoteid'], false, $ph2ent['mode']); - } else if (!empty($a_client['pool_address'])) { + } else if (!empty($a_client['pool_address'])) $rightsubnet_spec[] = "{$a_client['pool_address']}/{$a_client['pool_netbits']}"; - $rightsourceip = "\trightsourceip={$a_client['pool_address']}/{$a_client['pool_netbits']}\n"; - } } else { $tunneltype = "type = transport"; @@ -765,8 +762,6 @@ EOD; $ipsecconf .= "\t{$ikelifeline}\n"; if ($ipseclifetime > 0) $ipsecconf .= "\tlifetime = {$ipseclifetime}s\n"; - if (!empty($rightsourceip)) - $ipsecconf .= "{$rightsourceip}"; if (!empty($rightsubnet_spec)) $ipsecconf .= "\trightsubnet = " . join(",", $rightsubnet_spec) . "\n"; if (!empty($leftsubnet_spec)) |
