projects
/
pve-firewall.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
af2bc60
)
skip non-existent aliases inside ipset configuration
author
Dietmar Maurer
<dietmar@proxmox.com>
Fri, 30 May 2014 10:40:25 +0000
(12:40 +0200)
committer
Dietmar Maurer
<dietmar@proxmox.com>
Fri, 30 May 2014 10:40:25 +0000
(12:40 +0200)
src/PVE/Firewall.pm
patch
|
blob
|
blame
|
history
diff --git
a/src/PVE/Firewall.pm
b/src/PVE/Firewall.pm
index 8f1d6b5570014679e33e9eb974163f96aa86da78..8407e3cc8b4b344980f97837380969e9b0af829e 100644
(file)
--- a/
src/PVE/Firewall.pm
+++ b/
src/PVE/Firewall.pm
@@
-2270,13
+2270,17
@@
sub generic_fw_config_parser {
my $nomatch = $1;
my $cidr = $2;
my $nomatch = $1;
my $cidr = $2;
- if($cidr !~ m/^${ip_alias_pattern}$/) {
- $cidr =~ s|/32$||;
- eval { pve_verify_ipv4_or_cidr($cidr); };
-
if (my $err = $@)
{
-
warn "$prefix: $cidr - $err"
;
-
next
;
+ eval {
+ if ($cidr =~ m/^${ip_alias_pattern}$/) {
+ resolve_alias($cluster_conf, $res, $cidr); # make sure alias exists
+
} else
{
+
$cidr =~ s|/32$||
;
+
pve_verify_ipv4_or_cidr($cidr)
;
}
}
+ };
+ if (my $err = $@) {
+ warn "$prefix: $cidr - $err";
+ next;
}
my $entry = { cidr => $cidr };
}
my $entry = { cidr => $cidr };