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

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

Author: ccaillet-guest
Date: Mon Feb 22 16:55:10 2010
New Revision: 736

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=736
Log:
Abort by Warn. Sometimes we need to have same subnets on different sites,
is commented, waiting for activation if needed.
- in Add_Server : adding the possibility for "undefining" an interface for
a particular numbered host with the special value "NONE"

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=736&op=diff
==============================================================================
--- branches/0.33-stable/debian/changelog (original)
+++ branches/0.33-stable/debian/changelog Mon Feb 22 16:55:10 2010
@@ -3,7 +3,10 @@
   [ 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.
+    Abort by Warn. Sometimes we need to have same subnets on different sites,
+    is commented, waiting for activation if needed.
+    - in Add_Server : adding the possibility for "undefining" an interface for
+    a particular numbered host with the special value "NONE"
 
  -- Christophe Caillet <quadchris at free.fr>  Thu, 14 Jan 2010 17:17:03 +0100
 

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=736&op=diff
==============================================================================
--- branches/0.33-stable/lib/PFTools/Net.pm (original)
+++ branches/0.33-stable/lib/PFTools/Net.pm Mon Feb 22 16:55:10 2010
@@ -1083,6 +1083,9 @@
 		    if ( defined $S->{'interface'}->{$i}->{$mnamindexnum} ) {
 			$lan = $S->{'interface'}->{$i}->{$mnamindexnum} ;
 		    }
+		    elsif ( defined $S->{'interface'}->{$i}->{'default'} && $S->{'interface'}->{$i}->{'default'} eq 'NONE' ) {
+			    next;
+		    }
 		    elsif ( ! defined $S->{'interface'}->{$i}->{'default'} ) {
 			Warn( $ERR_SYNTAX, "No default vlan defined for interface ".$i." skipping this interface for host $mnam" ) ;
 			next ;
@@ -1441,14 +1444,14 @@
 	    "Masque de reseau manquant pour le reseau " . $net );
     }
 
-    if ( defined( $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} } ) ) {
-	Warn( $ERR_SYNTAX,
-	          "Adresse de reseau dupliquee ("
-		. $S->{'network'}
-		. ") pour le reseau "
-		. $net . " avec le reseau "
-		. $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} );
-    }
+#     if ( defined( $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} } ) ) {
+# 	Warn( $ERR_SYNTAX,
+# 	          "Adresse de reseau dupliquee ("
+# 		. $S->{'network'}
+# 		. ") pour le reseau "
+# 		. $net . " avec le reseau "
+# 		. $Z->{'NETWORK'}->{'BY_ADDR'}->{ $S->{'network'} }->{'name'} );
+#     }
 
     # Calcul des adresses, netmasks et broadcasts
     $N->{'name'}      = $net;