From: Dietmar Maurer Date: Mon, 31 Mar 2014 09:39:41 +0000 (+0200) Subject: s/rulset/ruleset/ X-Git-Url: https://git.proxmox.com/?p=pve-firewall.git;a=commitdiff_plain;h=df7cb349158bf0d804db1eb30e048aba797f0294 s/rulset/ruleset/ --- diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 126717d..834acba 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -2299,7 +2299,7 @@ sub print_sig_rule { return "-A $chain -m comment --comment \"PVESIG:$sig\"\n"; } -sub get_rulset_cmdlist { +sub get_ruleset_cmdlist { my ($ruleset, $verbose) = @_; my $cmdlist = "*filter\n"; # we pass this to iptables-restore; @@ -2420,7 +2420,7 @@ sub apply_ruleset { my $ipsetcmdlist = get_ipset_cmdlist($ipset_ruleset, $verbose); - my $cmdlist = get_rulset_cmdlist($ruleset, $verbose); + my $cmdlist = get_ruleset_cmdlist($ruleset, $verbose); print $ipsetcmdlist if $verbose; diff --git a/src/pvefw b/src/pvefw index a87bafb..6dd1aaf 100755 --- a/src/pvefw +++ b/src/pvefw @@ -64,7 +64,7 @@ __PACKAGE__->register_method ({ if ($param->{verbose}) { my (undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset, 1); - my (undef, $ruleset_changes) = PVE::Firewall::get_rulset_cmdlist($ruleset, 1); + my (undef, $ruleset_changes) = PVE::Firewall::get_ruleset_cmdlist($ruleset, 1); if ($ipset_changes || $ruleset_changes) { print "detected changes\n"; } else { @@ -118,7 +118,7 @@ __PACKAGE__->register_method ({ my ($ruleset, $hostfw_conf, $ipset_ruleset) = PVE::Firewall::compile(); my (undef, $ipset_changes) = PVE::Firewall::get_ipset_cmdlist($ipset_ruleset); - my (undef, $ruleset_changes) = PVE::Firewall::get_rulset_cmdlist($ruleset); + my (undef, $ruleset_changes) = PVE::Firewall::get_ruleset_cmdlist($ruleset); # fixme: ipset changes $res->{changes} = ($ipset_changes || $ruleset_changes) ? 1 : 0; }