pf-tools/pf-tools: FIX: file generated now pass dhcp3-server con...

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

details:   http://hg.debian.org/hg/pf-tools/pf-tools/rev/625324740c63
changeset: 918:625324740c63
user:      "Christophe Caillet <quadchris at free.fr>"
date:      Fri Nov 05 10:31:14 2010 +0100
description:
FIX: file generated now pass dhcp3-server control syntax

diffstat:

1 file changed, 1 insertion(+), 1 deletion(-)
lib/PFTools/Utils.pm |    2 +-

diffs (63 lines):

diff -r 928c4be180f3 -r 625324740c63 lib/PFTools/Utils.pm
--- a/lib/PFTools/Utils.pm	Wed Nov 03 10:44:58 2010 +0100
+++ b/lib/PFTools/Utils.pm	Fri Nov 05 10:31:14 2010 +0100
@@ -698,7 +698,9 @@
 
 sub Mk_dhcp {
     my ( $header_file, $site_part ) = @_;
-    my $dhcp = [];
+    my $dhcp_header = [];
+    my $dhcp_hosts  = [];
+    my $dhcp_subnet = [];
 
     if ( $header_file ne '' ) {
         unless( -e $header_file ) {
@@ -710,40 +712,30 @@
         }
         foreach (<$header_hl>) {
             chomp;
-            push( @{$dhcp}, $_ );
+            push( @{$dhcp_header}, $_ );
         }
         $header_hl->close();
     }
 
     foreach my $vlan ( keys %{$site_part} ) {
         push(
-            @{$dhcp},
-            "subnet "
-                . $site_part->{$vlan}->{'subnet'}
-                . " netmask "
-                . $site_part->{$vlan}->{'netmask'} . " {"
+            @{$dhcp_subnet},
+                "subnet " . $site_part->{$vlan}->{'subnet'}
+                . " netmask " . $site_part->{$vlan}->{'netmask'} . " {\n}\n"
         );
-        if ( $site_part->{$vlan}->{'routers'} ) {
-            push(
-                @{$dhcp},
-                "\toption routers " . $site_part->{$vlan}->{'routers'} . ";",
-                ''
-            );
-        }
         foreach my $hostclass ( keys %{ $site_part->{$vlan} } ) {
             next if ( $hostclass =~ m{\A (subnet|netmask|routers) \Z}xmso );
             my $host_part = $site_part->{$vlan}->{$hostclass};
             foreach my $host ( keys %{$host_part} ) {
-                push( @{$dhcp}, "\thost " . $host . " {" );
+                push( @{$dhcp_hosts}, "host " . $host . " {" );
                 foreach my $def ( @{ $host_part->{$host} } ) {
-                    push( @{$dhcp}, "\t\t" . $def );
+                    push( @{$dhcp_hosts}, "\t" . $def );
                 }
-                push( @{$dhcp}, "\t}" );
+                push( @{$dhcp_hosts}, "}", "" );
             }
         }
-        push( @{$dhcp}, "}", '' );
     }
-    return $dhcp;
+    return [ @{$dhcp_header}, @{$dhcp_subnet}, @{$dhcp_hosts} ];
 }
 
 sub Mk_sourceslist {