X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fsvc_acct.import;h=eb94e1c37af186b6f121d68e273df2d4795edc2a;hp=0acd731c5c30d8fc579e80869c772639e9e021ea;hb=157e8bdba110b7aac022bd2c2f7b377d3c5b2f85;hpb=1c14b1faec0f3f07a6d4190cf535b3ddb45075ce

diff --git a/bin/svc_acct.import b/bin/svc_acct.import
index 0acd731c5..eb94e1c37 100755
--- a/bin/svc_acct.import
+++ b/bin/svc_acct.import
@@ -1,52 +1,5 @@
 #!/usr/bin/perl -Tw
-#
-# $Id: svc_acct.import,v 1.12 2001-04-22 01:56:15 ivan Exp $
-#
-# ivan@sisd.com 98-mar-9
-#
-# changed 'password' field to '_password' because PgSQL 6.3 reserves this word
-#	bmccane@maxbaud.net  98-Apr-3
-#
-# generalized svcparts (still needs radius import) ivan@sisd.com 98-mar-23
-#
-# radius import, now an interactive script.  still needs erpcd import?
-# ivan@sisd.com 98-jun-24
-#
-# arbitrary radius attributes ivan@sisd.com 98-aug-9
-#
-# 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
-# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN)
-#
-# Revision 1.11  2000/06/29 12:27:01  ivan
-# s/password/_password/ for PostgreSQL wasn't done in the import.
-#
-# 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
-# import fix, noticed by Ben Leibig and Joel Griffiths
-#
-# Revision 1.6  1999/07/08 01:49:00  ivan
-# updates to avoid -w warnings from Joel Griffiths <griff@aver-computer.com>
-#
-# Revision 1.5  1999/03/25 08:42:19  ivan
-# import stuff uses Term::Query and spits out (some kinds of) nonsensical input
-#
-# Revision 1.4  1999/03/24 00:43:38  ivan
-# die if no relevant services
-#
-# Revision 1.3  1998/12/10 07:23:16  ivan
-# use FS::Conf, need user (for datasrc)
-#
-# Revision 1.2  1998/10/13 12:07:51  ivan
-# Assigns password from the shadow file for RADIUS password "UNIX"
-#
+# $Id: svc_acct.import,v 1.17 2001-08-19 10:25:44 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -61,6 +14,8 @@ use FS::part_svc;
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shuddown /bin/halt); #others?
+
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
 $FS::svc_acct::nossh_hack = 1;
@@ -157,7 +112,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 +155,8 @@ my(%password);
 while (<SHADOW>) {
   chop;
   my($username,$password)=split(/:/);
+  #$password =~ s/^\!$/\*/;
+  #$password =~ s/\!+/\*SUSPENDED\* /;
   $password{$username}=$password;
 }