diff options
| author | jim-p <jimp@pfsense.org> | 2010-10-19 14:19:44 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-10-19 14:19:44 -0400 |
| commit | f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4 (patch) | |
| tree | 5d64e957ba798bc7818f31a3dc7b1593de59a7f0 /etc/inc/vpn.inc | |
| parent | 6751b3e7863196ab865f8fb76a2ad6e9f8556788 (diff) | |
| download | pfsense-f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4.zip pfsense-f2a86ca96fb8e49d978679dab4cfad6ce2f0d9f4.tar.gz | |
Rename 'name' to 'descr' for CA, Certificates, and CRLs, to gain CDATA protection and standardize field names. Ticket #320.
Diffstat (limited to 'etc/inc/vpn.inc')
| -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 8670bde..b346ce6 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -206,18 +206,18 @@ function vpn_ipsec_configure($ipchg = false) if (is_array($config['ca']) && count($config['ca'])) { foreach ($config['ca'] as $ca) { if (!isset($ca['crt'])) { - log_error("Error: Invalid certificate info for {$ca['name']}"); + log_error("Error: Invalid certificate info for {$ca['descr']}"); continue; } $cert = base64_decode($ca['crt']); $x509cert = openssl_x509_parse(openssl_x509_read($cert)); if (!is_array($x509cert) || !isset($x509cert['hash'])) { - log_error("Error: Invalid certificate hash info for {$ca['name']}"); + log_error("Error: Invalid certificate hash info for {$ca['descr']}"); continue; } $fname = $g['varetc_path']."/".$x509cert['hash'].".0"; if (!file_put_contents($fname, $cert)) { - log_error("Error: Cannot write IPsec CA file for {$ca['name']}"); + log_error("Error: Cannot write IPsec CA file for {$ca['descr']}"); continue; } } |
