From: khoff <khoff>
Date: Fri, 12 Sep 2003 00:14:48 +0000 (+0000)
Subject: @excludeaddr is a list of addresses, not NetAddrs, so it shouldn't be map'd
X-Git-Tag: NET_WHOIS_RAW_0_31~412
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=85e1e6cd17d746818ad898bdac7c48de91398b2b;ds=sidebyside

@excludeaddr is a list of addresses, not NetAddrs, so it shouldn't be map'd
---

diff --git a/FS/FS/addr_block.pm b/FS/FS/addr_block.pm
index 4b034ef0c..1fb60606d 100755
--- a/FS/FS/addr_block.pm
+++ b/FS/FS/addr_block.pm
@@ -176,11 +176,12 @@ sub next_free_addr {
   my $conf = new FS::Conf;
   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) {