X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Faddr_block.pm;h=1fb60606da9cd363d255f0a3adc3b33a704ec1d7;hp=c9305f6af805553528f60e0f1be2053e48cfd6a0;hb=649ceeca76084d16d22013124bd7f80f053d75c4;hpb=4eaa305a53b129021c3a40e9ed49196f4b4d8907

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index c9305f6af..1fb60606d 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -122,7 +122,7 @@ sub check {
     }
   }
 
-  '';
+  $self->SUPER::check;
 }
 
 
@@ -174,13 +174,14 @@ sub next_free_addr {
   my $self = shift;
 
   my $conf = new FS::Conf;
-  my @excludeaddr = $conf->config('excludeaddr');
+  my @excludeaddr = $conf->config('exclude_ip_addr');
   
-  my @used = (
-    map { $_->NetAddr->addr } 
-      ($self, 
-       qsearch('svc_broadband', { blocknum => $self->blocknum }) ),
-     @excludeaddr );
+my @used =
+( (map { $_->NetAddr->addr }
+    ($self,
+     qsearch('svc_broadband', { blocknum => $self->blocknum }))
+  ), @excludeaddr
+);
 
   my @free = $self->NetAddr->hostenum;
   while (my $ip = shift @free) {
@@ -324,5 +325,7 @@ To be implemented.
 Minimum block size should be a config option.  It's hardcoded at /30 right
 now because that's the smallest block that makes any sense at all.
 
+=cut
+
 1;