diff options
| -rw-r--r-- | etc/inc/ipsec.inc | 1 | ||||
| -rw-r--r-- | etc/inc/vpn.inc | 4 | ||||
| -rw-r--r-- | usr/local/www/vpn_ipsec_phase1.php | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index d3a6fe8..6654166 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -54,6 +54,7 @@ $my_identifier_list = array( global $peer_identifier_list; $peer_identifier_list = array( + 'any' => array('desc' => gettext('Any'), 'mobile' => true), 'peeraddress' => array('desc' => gettext('Peer IP address'), 'mobile' => false), 'address' => array('desc' => gettext('IP address'), 'mobile' => false), 'fqdn' => array('desc' => gettext('Distinguished name'), 'mobile' => true), diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 6772f6d..13dbffe 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -862,7 +862,9 @@ EOD; // Only specify peer ID if we are not dealing with mobile PSK } else { list ($peerid_type, $peerid_data) = ipsec_find_id($ph1ent, 'peer', $rgmap); - if ($peerid_type != 'address' && $peerid_type != 'keyid' && $peerid_type != 'asn1dn') { + if ($peerid_type == 'any') { + $peerid_spec = ''; + } elseif ($peerid_type != 'address' && $peerid_type != 'keyid' && $peerid_type != 'asn1dn') { $peerid_spec = "{$peerid_type}:{$peerid_data}"; } elseif ($peerid_type == "asn1dn") { /* asn1dn needs double quotes */ diff --git a/usr/local/www/vpn_ipsec_phase1.php b/usr/local/www/vpn_ipsec_phase1.php index b9079e1..11a2e90 100644 --- a/usr/local/www/vpn_ipsec_phase1.php +++ b/usr/local/www/vpn_ipsec_phase1.php @@ -529,7 +529,9 @@ function peeridsel_change() { value = document.iform.peerid_type.options[index].value; if (value == 'peeraddress') { document.getElementById('peerid_data').style.visibility = 'hidden'; - } else { + } else if (value == 'any') { + document.getElementById('peerid_data').style.visibility = 'hidden'; + } else { document.getElementById('peerid_data').style.visibility = 'visible'; } } |
