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:43:56 -0500 |
| commit | d812e83efb51f28d9167e6c1d81a7a0848ccbbfc (patch) | |
| tree | 4df1f99b79141df8c7abd2633e232588abed8ff9 /etc | |
| parent | 62102a8b1a8d494c872dd31311f94aea99e97250 (diff) | |
| download | pfsense-d812e83efb51f28d9167e6c1d81a7a0848ccbbfc.zip pfsense-d812e83efb51f28d9167e6c1d81a7a0848ccbbfc.tar.gz | |
Use $myid in ipsec.secrets. Ticket #4785
Conflicts:
etc/inc/vpn.inc
Diffstat (limited to 'etc')
| -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 0cd0213..0ddebbf 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -629,7 +629,7 @@ 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; @@ -637,7 +637,7 @@ EOD; $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"; |
