projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mandrake
[freeside.git]
/
bin
/
passwd.import
diff --git
a/bin/passwd.import
b/bin/passwd.import
index
09af6a3
..
093f8ba
100755
(executable)
--- a/
bin/passwd.import
+++ b/
bin/passwd.import
@@
-1,5
+1,5
@@
#!/usr/bin/perl -Tw
#!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.
3 2002-06-21 09:13:16
ivan Exp $
+# $Id: passwd.import,v 1.
8 2003-06-12 14:08:00
ivan Exp $
use strict;
use vars qw(%part_svc);
use strict;
use vars qw(%part_svc);
@@
-7,14
+7,14
@@
use Date::Parse;
use Term::Query qw(query);
use Net::SCP qw(iscp);
use FS::UID qw(adminsuidsetup datasrc);
use Term::Query qw(query);
use Net::SCP qw(iscp);
use FS::UID qw(adminsuidsetup datasrc);
-use FS::Record qw(qsearch);
+use FS::Record qw(qsearch
qsearchs
);
use FS::svc_acct;
use FS::part_svc;
my $user = shift or die &usage;
adminsuidsetup $user;
use FS::svc_acct;
use FS::part_svc;
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;
@@
-86,10
+86,10
@@
while (<PASSWD>) {
my $svcpart = $shell_svcpart;
my $svcpart = $shell_svcpart;
- if ( qsearchs('svc_acct', { 'username' => $username } ) ) {
- warn "warning: $username already exists; skipping\n";
- next;
- }
+
#
if ( qsearchs('svc_acct', { 'username' => $username } ) ) {
+
#
warn "warning: $username already exists; skipping\n";
+
#
next;
+
#
}
my($svc_acct) = new FS::svc_acct ({
'svcpart' => $svcpart,
my($svc_acct) = new FS::svc_acct ({
'svcpart' => $svcpart,
@@
-104,7
+104,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";
+ }
+ }
}
}