pf-tools commit: r725 [ccaillet-guest] - in /trunk: debian/changelog filters/filter_privateresolve filters/filter_vlan2if

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

Author: ccaillet-guest
Date: Tue Dec  1 13:26:39 2009
New Revision: 725

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=725
Log:
according to the value extracted from host parameter (backported from branche
* filters/filter_vlan2if : substitution occured with POPNAME keyword
according to the value extracted from host parameter (backported from branche
0.33-stable)

Modified:
    trunk/debian/changelog
    trunk/filters/filter_privateresolve
    trunk/filters/filter_vlan2if

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=725&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Dec  1 13:26:39 2009
@@ -44,10 +44,13 @@
       specifies a version to install (NEED TESTING!!). A control is done for
       the availability of the specified version.
   * filters/filter_privateresolve : substitution occured with POPNAME keyword
-    accroding to the value which is in $SUBST hashtable (backported from branche
+    according to the value extracted from host parameter (backported from branche
     0.33-stable)
   * lib/PFTools/Net.pm : permit different bonding definition for a specified
     host number (backported from branche 0.33-stable)
+  * filters/filter_vlan2if : substitution occured with POPNAME keyword
+    according to the value extracted from host parameter (backported from branche
+    0.33-stable)
 
   [ Thomas Parmelan ]
   * debian/control
@@ -69,7 +72,7 @@
   * tools/kvmlaunch:
     - new script.
 
- -- Christophe Caillet <tof at sitadelle.com>  Wed, 25 Nov 2009 17:14:57 +0100
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 01 Dec 2009 14:25:12 +0100
 
 pf-tools (0.33.1-1) unstable; urgency=low
 

Modified: trunk/filters/filter_privateresolve
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_privateresolve?rev=725&op=diff
==============================================================================
--- trunk/filters/filter_privateresolve (original)
+++ trunk/filters/filter_privateresolve Tue Dec  1 13:26:39 2009
@@ -23,9 +23,9 @@
 use strict;
 use warnings;
 
+use PFTools::Conf;
 use PFTools::Net;
 use PFTools::Update;
-use PFTools::Conf;
 
 my ( $src, $host, $dst, $sep ) = @ARGV;
 unless ( $src and $host and $dst ) {
@@ -35,6 +35,8 @@
 $sep = ' ' unless defined $sep;
 
 my $Z = Init_lib_net( Get_source("GLOBAL:private-network") );
+my %subst;
+Init_SUBST ( \%subst, $host, "private" );
 
 open SRC, "<$src" or die "open: $src: $!\n";
 open DST, ">$dst" or die "open: $dst: $!\n";
@@ -59,7 +61,7 @@
 
 	    my $match2 = $match;
 	    $match2 =~ s/HOSTNAME/$host/;
-	    $match2 =~ s/POPNAME/$SUBST{'POPNAME'}/g;
+	    $match2 =~ s/POPNAME/$subst{'POPNAME'}/g;
 
 	    my @resolved = Resolv( $match2, $Z );
 

Modified: trunk/filters/filter_vlan2if
URL: http://svn.debian.org/wsvn/pf-tools/trunk/filters/filter_vlan2if?rev=725&op=diff
==============================================================================
--- trunk/filters/filter_vlan2if (original)
+++ trunk/filters/filter_vlan2if Tue Dec  1 13:26:39 2009
@@ -27,6 +27,7 @@
 use strict;
 use warnings;
 
+use PFTools::Conf;
 use PFTools::Net;
 use PFTools::Update;
 
@@ -37,6 +38,8 @@
 }
 
 my $Z = Init_lib_net( Get_source("GLOBAL:private-network") );
+my %subst;
+Init_SUBST ( \%subst, $host, "private" );
 
 open SRC, "<$src" or die "open: $src: $!\n";
 open DST, ">$dst" or die "open: $dst: $!\n";
@@ -46,7 +49,7 @@
     my $pos  = length $line;
     while (
 	substr( $line, 0, $pos )
-	=~ m/^(.*[^A-Za-z0-9.-])?(eth([-.:])([a-z0-9-]+))([^A-Za-z0-9.-].*)?$/
+	=~ m/^(.*[^A-Za-z0-9.-])?(eth([-.:])([A-Za-z0-9-]+))([^A-Za-z0-9.-].*)?$/
 	)
     {
 	my $before = $1;
@@ -57,7 +60,10 @@
 
 	my $lengthbefore = defined $before ? length $before : 0;
 
-	my $eth = Get_If( $Z, $host, $vlan );
+	my $vlan2 = $vlan;
+	$vlan2 =~ s/POPNAME/$subst{'POPNAME'}/;
+
+	my $eth = Get_If( $Z, $host, $vlan2 );
 
 	if ( defined $eth ) {
 	    my $neweth = $eth;