X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsvc_acct.import;h=6541a9fd4b2f258259f419b84f6af55270813458;hp=512572251618f99791df53c1f40dbe0f8ae86127;hb=6cd87c0d3b5280446301c647fa5f1ec5a593fa3f;hpb=93ced168cd4e1e23d36094a919576fc646b4df28

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 512572251..6541a9fd4 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.5 1999-03-25 08:42:19 ivan Exp $
+# $Id: svc_acct.import,v 1.7 1999-07-08 02:32:26 ivan Exp $
 #
 # ivan@sisd.com 98-mar-9
 #
@@ -17,7 +17,13 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.5  1999-03-25 08:42:19  ivan
+# Revision 1.7  1999-07-08 02:32:26  ivan
+# import fix, noticed by Ben Leibig and Joel Griffiths
+#
+# Revision 1.6  1999/07/08 01:49:00  ivan
+# updates to avoid -w warnings from Joel Griffiths <griff@aver-computer.com>
+#
+# Revision 1.5  1999/03/25 08:42:19  ivan
 # import stuff uses Term::Query and spits out (some kinds of) nonsensical input
 #
 # Revision 1.4  1999/03/24 00:43:38  ivan
@@ -112,14 +118,16 @@ sub menu_svc {
 }
 sub getpart {
   $^W=0; # Term::Query isn't -w-safe
-  query "Enter part number:", 'irk', [ keys %part_svc ];
+  my $return = query "Enter part number:", 'irk', [ keys %part_svc ];
   $^W=1;
+  $return;
 }
 sub getvalue {
   my $prompt = shift;
   $^W=0; # Term::Query isn't -w-safe
-  query $prompt, '';
+  my $return = query $prompt, '';
   $^W=1;
+  $return;
 }
 
 print "\n\n";
@@ -149,8 +157,12 @@ while (<USERS>) {
   while (<USERS>) {
     chop;
     if ( /^\s*$/ ) {
-      $ip{$username}=$param{'radius_Framed_IP_Address'}||'0e0';
-      delete $param{'radius_Framed_IP_Address'};
+      if ( defined $param{'radius_Framed_IP_Address'} ) {
+        $ip{$username} = $param{'radius_Framed_IP_Address'};
+        delete $param{'radius_Framed_IP_Address'};
+      } else {
+        $ip{$username} = '0e0';
+      }
       $allparam{$username}={ %param };
       last;
     } elsif ( /^\s+([\w\-]+)\s=\s"?([\w\.\-\s]+)"?,?\s*$/ ) {
@@ -163,8 +175,12 @@ while (<USERS>) {
   }
 }
 #? incase there isn't a terminating blank line ?
-$ip{$username}=$param{'radius_Framed_IP_Address'}||'0e0';
-delete $param{'radius_Framed_IP_Address'};
+if ( defined $param{'radius_Framed_IP_Address'} ) {
+  $ip{$username} = $param{'radius_Framed_IP_Address'};
+  delete $param{'radius_Framed_IP_Address'};
+} else {
+  $ip{$username} = '0e0';
+}
 $allparam{$username}={ %param };
 
 my(%password);