pf-tools/pf-tools: 2 new changesets

[parmelan-guest at users.alioth.debian.org]

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/0a5b89b2a97b
changeset: 1063:0a5b89b2a97b
user:      "Christophe Caillet <quadchris at free.fr>"
date:      Tue Nov 23 15:41:12 2010 +0100
description:
Fix: we need to protect \ character

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/d03e580455af
changeset: 1064:d03e580455af
user:      "Christophe Caillet <quadchris at free.fr>"
date:      Tue Nov 23 15:42:01 2010 +0100
description:
Fix: now the resolver from configuration hash is working with the split of private and public parts

diffstat:

1 file changed, 1 insertion(+), 3 deletions(-)
lib/PFTools/Structqueries.pm |    4 +---

diffs (30 lines):

diff -r 971750f50194 -r d03e580455af lib/PFTools/Structqueries.pm
--- a/lib/PFTools/Structqueries.pm	Tue Nov 23 12:46:21 2010 +0100
+++ b/lib/PFTools/Structqueries.pm	Tue Nov 23 15:42:01 2010 +0100
@@ -472,9 +472,11 @@
         }xms;
 
     my $zone_key = $ip_type eq 'ipv6' ? 'ZONE6' : 'ZONE';
-    my $zone_part
-        = $global_config->{$zone_key}->{'BY_NAME'}->{$zone_name}->{'BY_SITE'}
-        ->{$site_name};
+    my $zone_ref = $global_config->{$zone_key}->{'BY_NAME'}->{$zone_name};
+    my $zone_part =
+        ( is_private_vlan ($hostvlan, $global_config, $site_name) )
+        ? $zone_ref->{'BY_SITE'}->{$site_name}
+        : $zone_ref->{'ALL_SITES'};
 
     if ( $hostname =~ m{\A (network|netmask|broadcast|gateway) }xms ) {
         if ( $hostvlan and not $zone_part->{$hostvlan} ) {
diff -r 971750f50194 -r d03e580455af lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Tue Nov 23 12:46:21 2010 +0100
+++ b/lib/PFTools/Utils.pm	Tue Nov 23 15:42:01 2010 +0100
@@ -681,7 +681,7 @@
                 [A-Za-z0-9.-]+
             )
             (                   # $3
-                [\]?
+                [\\]?
             )
             (                   # $4
                 [.]