pf-tools commit: r576 [ccaillet-guest] - in /trunk: debian/changelog lib/PFTools/Net.pm

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

Author: ccaillet-guest
Date: Tue Feb  5 12:41:45 2008
New Revision: 576

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=576
Log:
* adding ERR: message and aborting when two interfaces are on the same vlan
  for a same host

Modified:
    trunk/debian/changelog
    trunk/lib/PFTools/Net.pm

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=576&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Tue Feb  5 12:41:45 2008
@@ -29,6 +29,8 @@
   * adding the possibility for routes to be function of the host number
   * adding a WARN: message when a tagged interface differs from defined tag
     for the vlan
+  * adding ERR: message and aborting when two interfaces are on the same vlan
+    for a same host
 
   [ Thomas Parmelan ]
   * lib-net: if no comment is specified in a zone, network or server
@@ -40,7 +42,7 @@
   * Update my email address.
   * Merge the remaining changes from 0.32.47-1 and 0.32.48-1.
 
- -- Christophe Caillet <quadchris at free.fr>  Tue, 05 Feb 2008 12:13:02 +0100
+ -- Christophe Caillet <quadchris at free.fr>  Tue, 05 Feb 2008 13:36:08 +0100
 
 pf-tools (0.32.48-1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=576&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Tue Feb  5 12:41:45 2008
@@ -1062,6 +1062,9 @@
 			Warn ( $ERR_SYNTAX, "Tag ".$1." differs from defined tag for vlan ".$lan ) if ( $1 != $Z->{'NETWORK'}->{'BY_NAME'}->{$lan}->{'tag'} );
 		}
 		$nam = $mnam . "." . $lan;
+		if ( $M->{'ifup'}->{$nam} ) {
+			Abort ( $ERR_SYNTAX, "Cannot define $i on vlan ".$lan." ".$M->{'ifup'}->{$nam}." is already on this vlan for host ".$mnam ) ;
+		}
 
 		my $addr = $Z->{'NETWORK'}->{'BY_NAME'}->{$lan}->{'network'};