diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-12-18 18:18:32 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-12-18 18:19:25 -0600 |
commit | 42a109916a5660186c073344e62bb8128de3d7bd (patch) | |
tree | c0587f64b60dd2faae48a056b756c11eb2fb3b01 | |
parent | bd1a6267712ff791f39edd0d70ec2a3528cd813d (diff) | |
download | pfsense-42a109916a5660186c073344e62bb8128de3d7bd.zip pfsense-42a109916a5660186c073344e62bb8128de3d7bd.tar.gz |
include $myid in these PSK lines. Ticket #4126
-rw-r--r-- | etc/inc/vpn.inc | 6 |
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 |