summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-12-18 18:18:32 -0600
committerChris Buechler <cmb@pfsense.org>2014-12-18 18:22:17 -0600
commit19ddaa31430a63552ad6b3f6e91457db143d5005 (patch)
tree5272344fc0645d997bd488c046a55dc47ca60eac
parent019c7b2dbebb11647024aefa399a9fb98d020824 (diff)
downloadpfsense-19ddaa31430a63552ad6b3f6e91457db143d5005.zip
pfsense-19ddaa31430a63552ad6b3f6e91457db143d5005.tar.gz
include $myid in these PSK lines. Ticket #4126
-rw-r--r--etc/inc/vpn.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index b2101f3..cb10924 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -495,7 +495,7 @@ EOD;
if (is_array($config['system']) && is_array($config['system']['user'])) {
foreach ($config['system']['user'] as $user) {
if (!empty($user['ipsecpsk'])) {
- $pskconf .= "{$user['name']} : PSK \"{$user['ipsecpsk']}\"\n";
+ $pskconf .= "{$myid} {$user['name']} : PSK \"{$user['ipsecpsk']}\"\n";
}
}
unset($user);
@@ -506,7 +506,7 @@ EOD;
foreach ($ipseccfg['mobilekey'] as $key) {
if ($key['ident'] == "allusers")
$key['ident'] = '';
- $pskconf .= "{$key['ident']} : PSK \"{$key['pre-shared-key']}\"\n";
+ $pskconf .= "{$myid} {$key['ident']} : PSK \"{$key['pre-shared-key']}\"\n";
}
unset($key);
}
@@ -1602,4 +1602,4 @@ function vpn_ipsec_configure_preferoldsa() {
set_single_sysctl("net.key.preferred_oldsa", "0");
}
-?>
+?> \ No newline at end of file
OpenPOWER on IntegriCloud