diff options
| author | ivan <ivan> | 2000-06-28 12:32:30 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2000-06-28 12:32:30 +0000 |
| commit | 88e029c6fab66a6596153b0f3d1f86e110f149ed (patch) | |
| tree | 614a20dd1289dba94e8041e1750b7c439518f611 | |
| parent | 7a503c0ec805aa1a428ee094660f8146efee4653 (diff) | |
allow RADIUS lines with "Auth-Type = Local" too
| -rwxr-xr-x | bin/svc_acct.import | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/svc_acct.import b/bin/svc_acct.import index c2ef4fd7f..691798b09 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.9 2000-06-28 12:03:53 ivan Exp $ +# $Id: svc_acct.import,v 1.10 2000-06-28 12:32:30 ivan Exp $ # # ivan@sisd.com 98-mar-9 # @@ -17,8 +17,8 @@ # don't import /var/spool/freeside/conf/shells! ivan@sisd.com 98-aug-13 # # $Log: svc_acct.import,v $ -# Revision 1.9 2000-06-28 12:03:53 ivan -# make svc_acct more forgiving about RADIUS users files +# 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 @@ -151,10 +151,10 @@ while (<USERS>) { next if /^\s*$/; next 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); - ($username,$password,$expiration)=(lc($1),$2,$4); + ($username,$password,$expiration)=(lc($1),$3,$5); $password = '' if $password eq 'UNIX'; $upassword{$username}=$password; undef %param; |