diff options
| author | pierrepomes <pierre.pomes@interface-tech.com> | 2010-10-05 21:19:02 -0400 |
|---|---|---|
| committer | pierrepomes <pierre.pomes@interface-tech.com> | 2010-10-05 21:19:02 -0400 |
| commit | aab78bd9469b35dc4c04469aadbdddb05243b90b (patch) | |
| tree | 5bf98d85a17ae4a6c5e69e42bf6d9b43f24f05c8 /etc/inc | |
| parent | 7fa03a98aa034f4e75b5ae60a3309ba5d404bcc5 (diff) | |
| download | pfsense-aab78bd9469b35dc4c04469aadbdddb05243b90b.zip pfsense-aab78bd9469b35dc4c04469aadbdddb05243b90b.tar.gz | |
Fix racoon.conf generation for localid_type=address. Ticket #936
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/vpn.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index b99449f..8670bde 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -638,10 +638,12 @@ EOD; /* Do not print localid in some cases, such as a pure-psk mobile tunnel */ if (($localid_type == "none") || ($ph1ent['authentication_method'] == "pre_shared_key") && isset($ph1ent['mobile'])) $localid_spec = " "; - else if ($localid_type != "address") { - $localid_type = "subnet"; - $localid_spec = $localid_type." ".$localid_data." any"; - } + else { + if ($localid_type != "address") { + $localid_type = "subnet"; + } + $localid_spec = $localid_type." ".$localid_data." any"; + } if (!isset($ph2ent['mobile'])) { $remoteid_type = $ph2ent['remoteid']['type']; |
