gah

[freeside.git] / bin / svc_acct.import

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 0acd731..119f770 100755 (executable)
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct.import,v 1.12 2001-04-22 01:56:15 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,19 @@
 # don't import /var/spool/freeside/conf/shells!  ivan@sisd.com 98-aug-13
 #
 # $Log: svc_acct.import,v $
-# Revision 1.12  2001-04-22 01:56:15  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
+# s/!/*/
+#
+# Revision 1.13  2001/05/05 08:51:16  ivan
+# http://www.sisd.com/freeside/list-archive/msg01915.html
+#
+# Revision 1.12  2001/04/22 01:56:15  ivan
 # get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
 #
 # Revision 1.11  2000/06/29 12:27:01  ivan
@@ -157,7 +169,7 @@ while (<USERS>) {
   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);
@@ -200,6 +212,8 @@ my(%password);
 while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
+  #$password =~ s/^\!$/\*/;
+  #$password =~ s/\!+/\*SUSPENDED\* /;
   $password{$username}=$password;
 }