summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2010-12-08 13:03:21 -0500
committerjim-p <jimp@pfsense.org>2010-12-08 13:04:05 -0500
commit8ab82decf758be7e9de85391ea95ee421615dc81 (patch)
tree30f0cd26888e4e54fd11e3d35c65b3852474825d /etc
parent409dc2e1cca772fa6d46403269554487d1236b09 (diff)
downloadpfsense-8ab82decf758be7e9de85391ea95ee421615dc81.zip
pfsense-8ab82decf758be7e9de85391ea95ee421615dc81.tar.gz
Only print "sainfo anonymous" also for xauth-psk setups. See http://forum.pfsense.org/index.php/topic,29164.msg157864.html#msg157864
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/vpn.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index e8cc824..cbadddf 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -636,8 +636,11 @@ EOD;
$localid_type = $ph2ent['localid']['type'];
$localid_data = ipsec_idinfo_to_cidr($ph2ent['localid']);
- /* Do not print localid in some cases, such as a pure-psk mobile tunnel */
- if (($localid_type == "none") || ($ph1ent['authentication_method'] == "pre_shared_key") && isset($ph1ent['mobile']))
+ /* Do not print localid in some cases, such as a pure-psk or psk/xauth mobile tunnel */
+ if (($localid_type == "none") ||
+ (($ph1ent['authentication_method'] == "xauth_psk_server") ||
+ ($ph1ent['authentication_method'] == "pre_shared_key"))
+ && isset($ph1ent['mobile']))
$localid_spec = " ";
else {
if ($localid_type != "address") {
OpenPOWER on IntegriCloud