From: ivan <ivan>
Date: Mon, 30 Jul 2001 06:07:47 +0000 (+0000)
Subject: allow !! for locked accounts instead of changing to *SUSPENDED*
X-Git-Tag: merged-freeside_vpopmail_support~33
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=6d49710a4eaaa51438b42059c2d97f1d99e7a243

allow !! for locked accounts instead of changing to *SUSPENDED*
---

diff --git a/bin/svc_acct.export b/bin/svc_acct.export
index 822f70a9d..7e92c61e8 100755
--- a/bin/svc_acct.export
+++ b/bin/svc_acct.export
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# $Id: svc_acct.export,v 1.20 2001-06-20 08:33:42 ivan Exp $
+# $Id: svc_acct.export,v 1.21 2001-07-30 06:07:46 ivan Exp $
 #
 # Create and export password files: passwd, passwd.adjunct, shadow,
 # acp_passwd, acp_userinfo, acp_dialup, users
@@ -38,7 +38,10 @@
 # ivan@sisd.com 98-sep-18
 # 
 # $Log: svc_acct.export,v $
-# Revision 1.20  2001-06-20 08:33:42  ivan
+# Revision 1.21  2001-07-30 06:07:46  ivan
+# allow !! for locked accounts instead of changing to *SUSPENDED*
+#
+# Revision 1.20  2001/06/20 08:33:42  ivan
 # >     Use of uninitialized value in concatenation (.) at svc_acct.export line
 # > 276.
 #
@@ -191,6 +194,7 @@ foreach $svc_acct (@svc_acct) {
   my($cpassword,$rpassword);
   if ( ( length($password) <= 8 )
        && ( $password ne '*' )
+       && ( $password ne '!!' )
        && ( $password ne '' )
      ) {
     $cpassword=crypt($password,
diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 2e51a8b2c..eaf0c03c5 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.14 2001-05-07 15:24:15 ivan Exp $
+# $Id: svc_acct.import,v 1.15 2001-07-30 06:07:47 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.14  2001-05-07 15:24:15  ivan
+# 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
@@ -206,8 +209,8 @@ my(%password);
 while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
-  $password =~ s/^\!$/\*/;
-  $password =~ s/\!+/\*SUSPENDED\* /;
+  #$password =~ s/^\!$/\*/;
+  #$password =~ s/\!+/\*SUSPENDED\* /;
   $password{$username}=$password;
 }