From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 18 Sep 2020 14:37:06 +0000 (+0200)
Subject: various typo fixes
X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=e1bfce947de0ddfbcaa9a74b52993906fbb92a53;ds=sidebyside

various typo fixes

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index e01fea5..46a1376 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -213,7 +213,7 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'udp', dport => '6881' },
     ],
     'Ceph' => [
-        "Ceph Storage Cluster traffic (Ceph Monitors, OSD & MDS Deamons)",
+        "Ceph Storage Cluster traffic (Ceph Monitors, OSD & MDS Daemons)",
 	# Legacy port for protocol v1
         { action => 'PARAM', proto => 'tcp', dport => '6789' },
 	# New port for protocol v2
@@ -276,7 +276,7 @@ my $pve_fw_macros = {
 	{ action => 'PARAM', proto => 'tcp', dport => '9418' },
     ],
     'HKP' => [
-	"OpenPGP HTTP keyserver protocol traffic",
+	"OpenPGP HTTP key server protocol traffic",
 	{ action => 'PARAM', proto => 'tcp', dport => '11371' },
     ],
     'HTTP' => [
@@ -636,7 +636,7 @@ $pve_std_chains_conf->{4} = {
     ],
     'PVEFW-tcpflags' => [
 	# same as shorewall tcpflags action.
-	# Packets arriving on this interface are checked for som illegal combinations of TCP flags
+	# Packets arriving on this interface are checked for some illegal combinations of TCP flags
 	{ match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG FIN,PSH,URG', target => '-g PVEFW-logflags' },
 	{ match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG NONE', target => '-g PVEFW-logflags' },
 	{ match => '-p tcp -m tcp --tcp-flags SYN,RST SYN,RST', target => '-g PVEFW-logflags' },
@@ -729,7 +729,7 @@ $pve_std_chains_conf->{6} = {
     ],
     'PVEFW-tcpflags' => [
 	# same as shorewall tcpflags action.
-	# Packets arriving on this interface are checked for som illegal combinations of TCP flags
+	# Packets arriving on this interface are checked for some illegal combinations of TCP flags
 	{ match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG FIN,PSH,URG', target => '-g PVEFW-logflags' },
 	{ match => '-p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG NONE', target => '-g PVEFW-logflags' },
 	{ match => '-p tcp -m tcp --tcp-flags SYN,RST SYN,RST', target => '-g PVEFW-logflags' },
@@ -1609,7 +1609,7 @@ sub verify_rule {
     my $set_ip_version = sub {
 	my $vers = shift;
 	if ($vers) {
-	    die "detected mixed ipv4/ipv6 adresses in rule\n"
+	    die "detected mixed ipv4/ipv6 addresses in rule\n"
 		if $ipversion && ($vers != $ipversion);
 	    $ipversion = $vers;
 	}
@@ -1999,7 +1999,7 @@ sub ebtables_get_chains {
     return $res;
 }
 
-# substitude action of rule according to action hash
+# substitute action of rule according to action hash
 sub rule_substitude_action {
     my ($rule, $actions) = @_;
 
@@ -3857,7 +3857,7 @@ sub compile_ipsets {
 	    return if !$vmfw_conf;
 
 	    # When the 'ipfilter' option is enabled every device for which there
-	    # is no 'ipfilter-netX' ipset defiend gets an implicit empty default
+	    # is no 'ipfilter-netX' ipset defined gets an implicit empty default
 	    # ipset.
 	    # The reason is that ipfilter ipsets are always filled with standard
 	    # IPv6 link-local filters.
@@ -3896,7 +3896,7 @@ sub compile_ipsets {
 	    return if !$vmfw_conf;
 
 	    # When the 'ipfilter' option is enabled every device for which there
-	    # is no 'ipfilter-netX' ipset defiend gets an implicit empty default
+	    # is no 'ipfilter-netX' ipset defined gets an implicit empty default
 	    # ipset.
 	    # The reason is that ipfilter ipsets are always filled with standard
 	    # IPv6 link-local filters, as well as the IP addresses configured
diff --git a/src/pvefw-logger.c b/src/pvefw-logger.c
index 181d5f1..b082f1e 100644
--- a/src/pvefw-logger.c
+++ b/src/pvefw-logger.c
@@ -1035,11 +1035,11 @@ main(int argc, char *argv[])
     for (int i = 10; i >= 0; i--) {
         if (flock(lockfd, LOCK_EX|LOCK_NB) != 0) {
             if (!i) {
-                fprintf(stderr, "unable to aquire lock '%s': %s\n", LOCKFILE, strerror (errno));
+                fprintf(stderr, "unable to acquire lock '%s': %s\n", LOCKFILE, strerror (errno));
                 exit(-1);
             }
             if (i == 10)
-                fprintf(stderr, "unable to aquire lock '%s' - trying again.\n", LOCKFILE);
+                fprintf(stderr, "unable to acquire lock '%s' - trying again.\n", LOCKFILE);
 
             sleep(1);
         }