projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow RADIUS lines with "Auth-Type = Local" too
[freeside.git]
/
bin
/
svc_acct.import
diff --git
a/bin/svc_acct.import
b/bin/svc_acct.import
index
893a829
..
691798b
100755
(executable)
--- a/
bin/svc_acct.import
+++ b/
bin/svc_acct.import
@@
-1,6
+1,6
@@
#!/usr/bin/perl -Tw
#
#!/usr/bin/perl -Tw
#
-# $Id: svc_acct.import,v 1.
8 2000-02-03 05:16:52
ivan Exp $
+# $Id: svc_acct.import,v 1.
10 2000-06-28 12:32:30
ivan Exp $
#
# ivan@sisd.com 98-mar-9
#
#
# ivan@sisd.com 98-mar-9
#
@@
-17,7
+17,10
@@
# don't import /var/spool/freeside/conf/shells! ivan@sisd.com 98-aug-13
#
# $Log: svc_acct.import,v $
# don't import /var/spool/freeside/conf/shells! ivan@sisd.com 98-aug-13
#
# $Log: svc_acct.import,v $
-# Revision 1.8 2000-02-03 05:16:52 ivan
+# Revision 1.10 2000-06-28 12:32:30 ivan
+# allow RADIUS lines with "Auth-Type = Local" too
+#
+# Revision 1.8 2000/02/03 05:16:52 ivan
# beginning of DNS and Apache support
#
# Revision 1.7 1999/07/08 02:32:26 ivan
# beginning of DNS and Apache support
#
# Revision 1.7 1999/07/08 02:32:26 ivan
@@
-145,12
+148,13
@@
my(%upassword,%ip,%allparam);
my(%param,$username);
while (<USERS>) {
chop;
my(%param,$username);
while (<USERS>) {
chop;
- next if /^$/;
+ next if /^\s*$/;
+ next if /^\s*#/;
if ( /^\S/ ) {
if ( /^\S/ ) {
- /^(\w+)\s+Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
+ /^(\w+)\s+
(Auth-Type\s+=\s+Local,\s+)
Password\s+=\s+"([^"]+)"(,\s+Expiration\s+=\s+"([^"]*")\s*)?$/
or die "1Unexpected line in users.import: $_";
my($password,$expiration);
or die "1Unexpected line in users.import: $_";
my($password,$expiration);
- ($username,$password,$expiration)=(lc($1),$
2,$4
);
+ ($username,$password,$expiration)=(lc($1),$
3,$5
);
$password = '' if $password eq 'UNIX';
$upassword{$username}=$password;
undef %param;
$password = '' if $password eq 'UNIX';
$upassword{$username}=$password;
undef %param;