X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fsvc_acct.import;h=119f7705b1a3100d3a05accfeb53a2f33cd826fc;hb=55b29dc1d28b0c27e7f8271e7fe382a36d75d268;hp=eaf0c03c53985c837d4d3cc647bdacc76e87804a;hpb=6d49710a4eaaa51438b42059c2d97f1d99e7a243;p=freeside.git diff --git a/bin/svc_acct.import b/bin/svc_acct.import index eaf0c03c5..119f7705b 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.15 2001-07-30 06:07:47 ivan Exp $ +# $Id: svc_acct.import,v 1.16 2001-08-17 10:57:40 ivan Exp $ # # 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 $ -# Revision 1.15 2001-07-30 06:07:47 ivan +# Revision 1.16 2001-08-17 10:57:40 ivan +# gah +# +# Revision 1.15 2001/07/30 06:07:47 ivan # allow !! for locked accounts instead of changing to *SUSPENDED* # # Revision 1.14 2001/05/07 15:24:15 ivan @@ -166,7 +169,7 @@ while () { next if /^\s*$/; next if /^\s*#/; if ( /^\S/ ) { - /^(\w+)\s+(Auth-Type\s+=\s+Local,\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),$3,$5);