projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#18361: Delay package from billing until services are provisioned [rename method]
[freeside.git]
/
bin
/
passwd.import
diff --git
a/bin/passwd.import
b/bin/passwd.import
index
fbf2737
..
8ab9e2a
100755
(executable)
--- a/
bin/passwd.import
+++ b/
bin/passwd.import
@@
-1,5
+1,4
@@
#!/usr/bin/perl -Tw
#!/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);
use strict;
use vars qw(%part_svc);
@@
-14,7
+13,7
@@
use FS::part_svc;
my $user = shift or die &usage;
adminsuidsetup $user;
my $user = shift or die &usage;
adminsuidsetup $user;
-push @FS::svc_acct::shells, qw(/bin/sync /sbin/shu
ddown /
bin/halt); #others?
+push @FS::svc_acct::shells, qw(/bin/sync /sbin/shu
tdown /bin/halt /s
bin/halt); #others?
my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
my($spooldir)="/usr/local/etc/freeside/export.". datasrc;
@@
-76,6
+75,8
@@
while (<SHADOW>) {
my($username,$password)=split(/:/);
#$password =~ s/^\!$/\*/;
#$password =~ s/\!+/\*SUSPENDED\* /;
my($username,$password)=split(/:/);
#$password =~ s/^\!$/\*/;
#$password =~ s/\!+/\*SUSPENDED\* /;
+ $password =~ s/^NP$/\*/;
+ $password =~ s/^\*LK\*$/\*/;
$password{$username}=$password;
}
$password{$username}=$password;
}
@@
-104,7
+105,13
@@
while (<PASSWD>) {
});
my($error);
$error=$svc_acct->insert;
});
my($error);
$error=$svc_acct->insert;
- die $error if $error;
+ if ( $error ) {
+ if ( $error =~ /duplicate/i ) {
+ warn "$username: $error";
+ } else {
+ die "$username: $error";
+ }
+ }
}
}