summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-10-01 13:19:42 -0500
committerChris Buechler <cmb@pfsense.org>2015-10-01 13:19:42 -0500
commit46545f30a002d587b6fc680d89ac404a466c41b5 (patch)
tree7df62ed2cc11d3b20d0893a53438fea28684f657
parent8ed4a1392990544e6dc7731ad9ac474dbc2f0bb1 (diff)
downloadpfsense-46545f30a002d587b6fc680d89ac404a466c41b5.zip
pfsense-46545f30a002d587b6fc680d89ac404a466c41b5.tar.gz
Specify %any where identifier is "any", so the note on these pages
actually works.
-rw-r--r--etc/inc/vpn.inc3
-rw-r--r--usr/local/www/vpn_ipsec_keys.php2
-rw-r--r--usr/local/www/vpn_ipsec_keys_edit.php2
3 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 1f19959..4a0b14d 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -696,6 +696,9 @@ EOD;
if ($key['ident'] == "allusers") {
$key['ident'] = '%any';
}
+ if ($key['ident'] == "any") {
+ $key['ident'] = '%any';
+ }
if (empty($key['type'])) {
$key['type'] = 'PSK';
}
diff --git a/usr/local/www/vpn_ipsec_keys.php b/usr/local/www/vpn_ipsec_keys.php
index ebddcc9..e769b24 100644
--- a/usr/local/www/vpn_ipsec_keys.php
+++ b/usr/local/www/vpn_ipsec_keys.php
@@ -196,7 +196,7 @@ if (is_subsystem_dirty('ipsec'))
<span class="red">
<strong><?=gettext("Note"); ?>:<br /></strong>
</span>
- <?=gettext("PSK for any user can be set by using an identifier of any/ANY");?>
+ <?=gettext("PSK for any user can be set by using an identifier of any");?>
</span>
</p>
</td>
diff --git a/usr/local/www/vpn_ipsec_keys_edit.php b/usr/local/www/vpn_ipsec_keys_edit.php
index 82ab80c..ac868c4 100644
--- a/usr/local/www/vpn_ipsec_keys_edit.php
+++ b/usr/local/www/vpn_ipsec_keys_edit.php
@@ -180,7 +180,7 @@ include("head.inc");
<span class="red">
<strong><?=gettext("Note"); ?>:<br /></strong>
</span>
- <?=gettext("PSK for any user can be set by using an identifier of any/ANY");?>
+ <?=gettext("PSK for any user can be set by using an identifier of any");?>
</span>
</p>
</td>
OpenPOWER on IntegriCloud