diff options
author | Chris Buechler <cmb@pfsense.org> | 2015-06-22 19:42:16 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2015-06-22 19:42:16 -0500 |
commit | fe96d7252cfec7047897705869c37e0bb4e73832 (patch) | |
tree | 54bd290aa432ad8823500209f7b539f2015f0b4c | |
parent | b731689365b578729e1d44db7ee8b607c0a3bc35 (diff) | |
download | pfsense-fe96d7252cfec7047897705869c37e0bb4e73832.zip pfsense-fe96d7252cfec7047897705869c37e0bb4e73832.tar.gz |
Use $myid in ipsec.secrets. Ticket #4785
-rw-r--r-- | etc/inc/vpn.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 7e64f88..ab19cb3 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -574,14 +574,14 @@ EOD; list ($myid_type, $myid_data) = ipsec_find_id($ph1ent, 'local'); list ($peerid_type, $peerid_data) = ipsec_find_id($ph1ent, 'peer', $rgmap); - $myid = isset($ph1ent['mobile']) ? trim($myid_data) : "%any"; + $myid = trim($myid_data); if (empty($peerid_data)) continue; $peerid = ($peerid_data != 'allusers') ? trim($peerid_data) : ''; if (!empty($ph1ent['pre-shared-key'])) { - if ($myid_type == 'fqdn' && !empty($myid_data)) + if ($myid_type == 'fqdn' && !empty($myid)) $pskconf .= "@{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n"; else $pskconf .= "{$myid} {$peerid} : PSK 0s" . base64_encode(trim($ph1ent['pre-shared-key'])) . "\n"; |