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

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

Author: parmelan-guest
Date: Thu Mar 15 15:33:24 2007
New Revision: 462

URL: http://svn.debian.org/wsvn/pf-tools/?sc=1&rev=462
Log:
* lib-net: if no comment is specified in a zone, network or server
  declaration, forge a default comment (to stop a few Perl warnings) and
  emits a warning asking to correct the configuration.

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

Modified: trunk/TODO
URL: http://svn.debian.org/wsvn/pf-tools/trunk/TODO?rev=462&op=diff
==============================================================================
--- trunk/TODO (original)
+++ trunk/TODO Thu Mar 15 15:33:24 2007
@@ -2,6 +2,7 @@
 |/-Difficulty: Easy/Medium/Hard
 ||
 UM convert lib-* to real packages; use strict and use warnings everywhere
+UE check that all mandatory entries are defined (ie: tag)
 UM use Net::IP for ipstart.* and check it is ok wrt the subnet declaration
 MM source = CVS:config/%HOST_TYPE%/%SECTIONNAME%
 LE Install everything in the correct directories (and ln -s for compatibility)

Modified: trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pf-tools/trunk/debian/changelog?rev=462&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu Mar 15 15:33:24 2007
@@ -1,11 +1,17 @@
 pf-tools (0.33-0WIP1) unstable; urgency=low
 
+  [ Christophe Caillet ]
   * Modifying lib-* to proper perl modules devel style
   * Adding use strict and other devel tricks
   * Some code cleaning
   * adding pf-tools.links file for compatibility with previous version
 
- -- Christophe Caillet <quadchris at free.fr>  Mon,  5 Mar 2007 16:51:43 +0100
+  [ Thomas Parmelan ]
+  * lib-net: if no comment is specified in a zone, network or server
+    declaration, forge a default comment (to stop a few Perl warnings) and
+    emits a warning asking to correct the configuration.
+
+ -- Thomas Parmelan <parmelan+debian at free.fr>  Thu, 15 Mar 2007 16:18:59 +0100
 
 pf-tools (0.32.46-1) unstable; urgency=low
 

Modified: trunk/lib/PFTools/Net.pm
URL: http://svn.debian.org/wsvn/pf-tools/trunk/lib/PFTools/Net.pm?rev=462&op=diff
==============================================================================
--- trunk/lib/PFTools/Net.pm (original)
+++ trunk/lib/PFTools/Net.pm Thu Mar 15 15:33:24 2007
@@ -828,6 +828,12 @@
             . ") pour le numero!" );
     }
 
+    unless ($S->{comment}) {
+	Warn( $ERR_SYNTAX,
+	    "No (or empty) comment for server $srv - please fix in config" );
+	$S->{comment} = "Server $srv <no comment specified>";
+    }
+
     # Initialisation de la structure pour ces serveurs
     my $N = {};
     $N->{'comment'} = $S->{'comment'};
@@ -1195,6 +1201,12 @@
             . $Z->{'SOA'}->{'name'} . ") et (" . $zone . ")" );
     }
 
+    unless ($S->{comment}) {
+	Warn( $ERR_SYNTAX,
+	    "No (or empty) comment for zone $zone - please fix in config" );
+	$S->{comment} = "Zone $zone <no comment specified>";
+    }
+
     # Ajout des informations SOA
     # Le numero de serie est genere automatiquement, on prends
     # l'heure system en seconde.
@@ -1271,11 +1283,18 @@
         Abort( $ERR_SYNTAX,
             "Masque de reseau manquant pour le reseau " . $net );
     }
+
     if ( defined( $Z->{'NETWORK'}->{ $S->{'network'} } ) ) {
         Abort( $ERR_SYNTAX,
             "Adresse de reseau dupliquee ("
             . $S->{'network'}
             . ") pour le reseau " . $net );
+    }
+
+    unless ($S->{comment}) {
+	Warn( $ERR_SYNTAX,
+	    "No (or empty) comment for network $net - please fix in config" );
+	$S->{comment} = "Network $net <no comment specified>";
     }
 
     # Calcul des adresses, netmasks et broadcasts