pf-tools commit: r734 [ccaillet-guest] - in /branches/0.33-stable: debian/changelog lib/PFTools/Net.pm

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

Author: ccaillet-guest
Date: Thu Jan 14 16:25:54 2010
New Revision: 734

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=734
Log:
* lib/PFTools/Net.pm
  - in Add_Network : fix th check for avoiding duplicate network, replacing
  Abort by Warn. Sometimes we need to have same subnets on differetn sites.

Modified:
    branches/0.33-stable/debian/changelog
    branches/0.33-stable/lib/PFTools/Net.pm

Modified: branches/0.33-stable/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/debian/changelog?rev=734&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Thu Jan 14 16:25:54 2010
@@ -1,3 +1,12 @@
+pf-tools (0.33.20-WIP0) unstable; urgency=low
+
+  [ Christophe Caillet ]
+  * lib/PFTools/Net.pm
+    - in Add_Network : fix th check for avoiding duplicate network, replacing
+    Abort by Warn. Sometimes we need to have same subnets on differetn sites.
+
+ -- Christophe Caillet <quadchris at free.fr>  Thu, 14 Jan 2010 17:17:03 +0100
+
 pf-tools (0.33.19-1) unstable; urgency=low
 
   [ Christophe Caillet ]

Modified: branches/0.33-stable/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/branches/0.33-stable/lib/PFTools/Net.pm?rev=734&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Net.pm (original)
+++ branches/0.33-stable/lib/PFTools/Net.pm Thu Jan 14 16:25:54 2010
@@ -61,7 +61,7 @@
 
 use PFTools::Conf;
 
-#use Data::Dumper;
+use Data::Dumper;
 #$Data::Dumper::Sortkeys = 1;
 #$Data::Dumper::Useperl = 1;
 
@@ -1441,12 +1441,13 @@
 	    "Masque de reseau manquant pour le reseau " . $net );
     }
 
-    if ( defined( $Z->{'NETWORK'}->{ $S->{'network'} } ) ) {
-	Abort( $ERR_SYNTAX,
+    if ( defined( $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} } ) ) {
+	Warn( $ERR_SYNTAX,
 	          "Adresse de reseau dupliquee ("
 		. $S->{'network'}
 		. ") pour le reseau "
-		. $net );
+		. $net . " avec le reseau "
+		. $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} );
     }
 
     # Calcul des adresses, netmasks et broadcasts