#!/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
#
# 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
}
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";
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*$/ ) {
}
}
#? 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);