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

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

Author: parmelan-guest
Date: Mon Mar 10 14:26:27 2008
New Revision: 584

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=584
Log:
* Bugfix for hosts without shortname definition.

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=584&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Mar 10 14:26:27 2008
@@ -48,8 +48,9 @@
     made mistakes...
   * Update my email address.
   * Merge the remaining changes from 0.32.47-1 and 0.32.48-1.
-
- -- Christophe Caillet <quadchris at free.fr>  Thu, 06 Mar 2008 17:04:52 +0100
+  * Bugfix for hosts without shortname definition.
+
+ -- Thomas Parmelan <tom+pf-tools at ankh.fr.EU.org>  Mon, 10 Mar 2008 15:09:37 +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=584&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Mon Mar 10 14:26:27 2008
@@ -1052,7 +1052,7 @@
 		elsif ( defined $S->{'ipstart'}->{'default'} ) {
 		    $start = $S->{'ipstart'}->{'default'};
 		}
-		else {
+		elsif ( defined $S->{'shortname'} ) {
 		    $start = $S->{'ipstart'}->{ $S->{'shortname'} };
 		}
 
@@ -1246,8 +1246,12 @@
 	    )
 	}
 	= $N;
-	$Z->{'SERVERS'}->{'BY_NAME'}->{$srv} = $N;
-    }
+    }
+#    else {
+#	Warn( $ERR_SYNTAX, "$srv: no shortname defined, so no SERVERS->BY_ADDR definition. Check this is really what you want!" );
+#    }
+
+    $Z->{'SERVERS'}->{'BY_NAME'}->{$srv} = $N;
 
     # Remapping UM
     if ($UML) {