diff options
author | ivan <ivan> | 2002-06-21 09:11:09 +0000 |
---|---|---|
committer | ivan <ivan> | 2002-06-21 09:11:09 +0000 |
commit | 7f1985f56afc81912dbc86a1a3178cd128af76fe (patch) | |
tree | 36363001fd4bb8d011a8e2481ca3e30d66daf129 /bin/passwd.import | |
parent | 45cf3a8cff466b4731a95e11ff7f4f76aee25d7c (diff) |
tiny bit better passwd.import
Diffstat (limited to 'bin/passwd.import')
-rwxr-xr-x | bin/passwd.import | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/bin/passwd.import b/bin/passwd.import index 8b5826bfe..aa4f90f98 100755 --- a/bin/passwd.import +++ b/bin/passwd.import @@ -1,5 +1,5 @@ #!/usr/bin/perl -Tw -# $Id: passwd.import,v 1.1 2002-04-20 11:57:35 ivan Exp $ +# $Id: passwd.import,v 1.2 2002-06-21 09:11:09 ivan Exp $ use strict; use vars qw(%part_svc); @@ -81,10 +81,15 @@ while (<SHADOW>) { while (<PASSWD>) { chop; - my($username,$x,$uid,$gid,$finger,$dir,$shell)=split(/:/); - my($password)=$upassword{$username} || $password{$username}; + my($username,$x,$uid,$gid,$finger,$dir,$shell) = split(/:/); + my $password = $password{$username}; - $svcpart = $shell_svcpart; + my $svcpart = $shell_svcpart; + + if ( qsearchs('svc_acct', { 'username' => $username } ) ) { + warn "warning: $username already exists; skipping\n"; + next; + } my($svc_acct) = new FS::svc_acct ({ 'svcpart' => $svcpart, @@ -95,13 +100,12 @@ while (<PASSWD>) { 'finger' => $finger, 'dir' => $dir, 'shell' => $shell, - %{$allparam{$username}}, + #%{$allparam{$username}}, }); my($error); $error=$svc_acct->insert; die $error if $error; - delete $upassword{$username}; } sub usage { |