X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=bin%2Fpasswd.import;h=8ab9e2ae3c67a6a7efcbe94bd464acd64dfe135a;hp=fbf27370f5bce96faa3245e0580555487111d1b9;hb=51c0d6572357ba4d7c11a11e7ff506428c1cc045;hpb=1e14a5e07df71cf985921cefac53b8873e813bcb

diff --git a/bin/passwd.import b/bin/passwd.import
index fbf27370f..8ab9e2ae3 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.5 2002-06-21 09:57:05 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -14,7 +13,7 @@ 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?
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shutdown /bin/halt /sbin/halt); #others?
 
 my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
 
@@ -76,6 +75,8 @@ while (<SHADOW>) {
   my($username,$password)=split(/:/);
   #$password =~ s/^\!$/\*/;
   #$password =~ s/\!+/\*SUSPENDED\* /;
+  $password =~ s/^NP$/\*/;
+  $password =~ s/^\*LK\*$/\*/;
   $password{$username}=$password;
 }
 
@@ -104,7 +105,13 @@ while (<PASSWD>) {
   });
   my($error);
   $error=$svc_acct->insert;
-  die $error if $error;
+  if ( $error ) {
+    if ( $error =~ /duplicate/i ) {
+      warn "$username: $error";
+    } else {
+      die "$username: $error";
+    }
+  }
 
 }