From 902d15046334045b5f24c2d9e179b3db6e1ee3f4 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 11 Apr 2012 13:23:07 -0700
Subject: don't override manually entered IP address with auto-assignment,
 #17163

---
 httemplate/edit/process/svc_broadband.cgi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'httemplate/edit/process')

diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index 31def255c..90eab4aad 100644
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -13,9 +13,9 @@ die "access denied"
 
 sub precheck {
   my $cgi = shift;
-  if ( !defined($cgi->param('ip_addr')) ) {
-    $cgi->param('ip_addr', $cgi->param('prev_ip_addr') || '');
-  }
+  my $ip_addr = $cgi->param('ip_addr');
+  $ip_addr =~ s/[^\d\.]//g; # converts '(automatic)' to null
+  $cgi->param('ip_addr', $ip_addr);
   $cgi->param("usergroup", [ $cgi->param('usergroup') ]);
   ''
 }
-- 
cgit v1.2.1