diff options
| author | Ermal <eri@pfsense.org> | 2014-05-15 13:50:35 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-05-15 13:50:35 +0000 |
| commit | 6586b30f3ffade0dfb7c56e44d495a943e47dd25 (patch) | |
| tree | 0e182566c349bd281b304240f04933b48d91662c /etc | |
| parent | b4ad5b1c2ab424c398679ba4d4a7a086bb5df372 (diff) | |
| download | pfsense-6586b30f3ffade0dfb7c56e44d495a943e47dd25.zip pfsense-6586b30f3ffade0dfb7c56e44d495a943e47dd25.tar.gz | |
Oops this was moved accidentally
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vpn.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 710e3b5..57962d5 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -541,12 +541,6 @@ EOD; $ikeid = $ph1ent['ikeid']; - /* Only specify peer ID if we are not dealing with a mobile PSK-only tunnel */ - $peerid_spec = ''; - if (!(($ph1ent['authentication_method'] == "pre_shared_key") && !isset($ph1ent['mobile']))) { - $peerid_spec = $peerid_data; - } - if ($ph1ent['mode'] == "aggressive") $aggressive = "yes"; else @@ -614,6 +608,12 @@ EOD; break; } + /* Only specify peer ID if we are not dealing with a mobile PSK-only tunnel */ + $peerid_spec = ''; + if (!(($ph1ent['authentication_method'] == "pre_shared_key") && !isset($ph1ent['mobile']))) { + $peerid_spec = $peerid_data; + } + if (is_array($ph1ent['encryption-algorithm']) && !empty($ph1ent['encryption-algorithm']['name']) && !empty($ph1ent['hash-algorithm'])) { $ealgosp1 = ''; $ealg_id = $ph1ent['encryption-algorithm']['name']; |
