diff options
| author | Mark Wells <mark@freeside.biz> | 2014-04-10 15:20:47 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2014-04-10 15:20:47 -0700 |
| commit | 4e95cbcc7a876017487f098a06b957e79c0acf77 (patch) | |
| tree | 6b1661cd7ea7da8f4bf5ef667bbd9bc426896f3a /FS/FS/svc_IP_Mixin.pm | |
| parent | 74e927acfe159514ba93b51bd79ccf68f1846c89 (diff) | |
stop new IP address assignment code from tripping over ancient svc_acct.slipip values, #28184
Diffstat (limited to 'FS/FS/svc_IP_Mixin.pm')
| -rw-r--r-- | FS/FS/svc_IP_Mixin.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/FS/FS/svc_IP_Mixin.pm b/FS/FS/svc_IP_Mixin.pm index ff7c2f5..5b06082 100644 --- a/FS/FS/svc_IP_Mixin.pm +++ b/FS/FS/svc_IP_Mixin.pm @@ -96,7 +96,12 @@ sub _used_addresses { my %hash = ( $ip_field => { op => '!=', value => '' } ); #$hash{'blocknum'} = $block->blocknum if $block; $hash{'svcnum'} = { op => '!=', value => $exclude->svcnum } if ref $exclude; - map { $_->NetAddr->addr } qsearch($class->table, \%hash); + map { my $na = $_->NetAddr; $na ? $na->addr : () } + qsearch({ + table => $class->table, + hashref => \%hash, + extra_sql => " AND $ip_field != '0e0'", + }); } sub _is_used { |