summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-10-02 16:19:58 -0500
committerChris Buechler <cmb@pfsense.org>2014-10-02 16:19:58 -0500
commit3c4fc30bea7a2beaeb26db7ba1952f8f88635480 (patch)
treec6a5136125f1c143626f508ed6ce8c08e1705e62 /etc/inc
parent3258d442764ca85efea93ebb96954123c952451a (diff)
downloadpfsense-3c4fc30bea7a2beaeb26db7ba1952f8f88635480.zip
pfsense-3c4fc30bea7a2beaeb26db7ba1952f8f88635480.tar.gz
get back to our standard RFC-defined capitalization of IPsec
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/filter.inc4
-rwxr-xr-xetc/inc/ipsec.auth-user.php2
-rw-r--r--etc/inc/ipsec.inc6
3 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 38680f7..57f60ec 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -2684,7 +2684,7 @@ function filter_rules_generate() {
$ipfrules .= "anchor \"relayd/*\"\n";
/* OpenVPN user rules from radius */
$ipfrules .= "anchor \"openvpn/*\"\n";
- /* IPSec user rules from radius */
+ /* IPsec user rules from radius */
$ipfrules .= "anchor \"ipsec/*\"\n";
# BEGIN OF firewall rules
/* default block logging? */
@@ -3563,7 +3563,7 @@ function filter_process_carp_rules($log) {
return $lines;
}
-/* Generate IPSEC Filter Items */
+/* Generate IPsec Filter Items */
function filter_generate_ipsec_rules($log = array()) {
global $config, $g, $FilterIflist, $tracker;
diff --git a/etc/inc/ipsec.auth-user.php b/etc/inc/ipsec.auth-user.php
index 1171735..8142b99 100755
--- a/etc/inc/ipsec.auth-user.php
+++ b/etc/inc/ipsec.auth-user.php
@@ -132,7 +132,7 @@ foreach ($authmodes as $authmode) {
$user = getUserEntry($username);
if (!is_array($user) || !userHasPrivilege($user, "user-ipsec-xauth-dialin")) {
$authenticated = false;
- syslog(LOG_WARNING, "user '{$username}' cannot authenticate through IPSec since the required privileges are missing.\n");
+ syslog(LOG_WARNING, "user '{$username}' cannot authenticate through IPsec since the required privileges are missing.\n");
continue;
}
}
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc
index 77f948c..c8833c1 100644
--- a/etc/inc/ipsec.inc
+++ b/etc/inc/ipsec.inc
@@ -39,7 +39,7 @@ $ipsec_loglevels = array("dmn" => "Daemon", "mgr" => "SA Manager", "ike" => "IKE
"job" => "Job Processing", "cfg" => "Configuration backend", "knl" => "Kernel Interface",
"net" => "Networking", "asn" => "ASN encoding", "enc" => "Message encoding",
"imc" => "Integrity checker", "imv" => "Integrity Verifier", "pts" => "Platform Trust Service",
- "tls" => "TLS handler", "esp" => "IPSec traffic", "lib" => "StrongSWAN Lib");
+ "tls" => "TLS handler", "esp" => "IPsec traffic", "lib" => "StrongSWAN Lib");
$my_identifier_list = array(
'myaddress' => array( 'desc' => gettext('My IP address'), 'mobile' => true ),
@@ -463,7 +463,7 @@ function ipsec_smp_dump_status() {
global $config, $g, $custom_listtags;
if (!file_exists("{$g['varrun_path']}/charon.xml")) {
- log_error("IPSec daemon seems to have issues or not running!");
+ log_error("IPsec daemon seems to have issues or not running!");
return;
}
@@ -607,7 +607,7 @@ function ipsec_dump_mobile() {
$_gb = exec("/usr/local/sbin/ipsec stroke leases > {$g['tmp_path']}/strongswan_leases.xml");
if (!file_exists("{$g['tmp_path']}/strongswan_leases.xml")) {
- log_error(gettext("IPSec daemon seems to have issues or not running! Could not display mobile user stats!"));
+ log_error(gettext("IPsec daemon seems to have issues or not running! Could not display mobile user stats!"));
return array();
}
OpenPOWER on IntegriCloud