X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fpasswd.import;h=fbf27370f5bce96faa3245e0580555487111d1b9;hb=ababd9b098c0a91383aff1df8a0a24492b58aba7;hp=aa4f90f98d95be2598893fd1f0692579f056d527;hpb=7f1985f56afc81912dbc86a1a3178cd128af76fe;p=freeside.git

diff --git a/bin/passwd.import b/bin/passwd.import
index aa4f90f98..fbf27370f 100755
--- a/bin/passwd.import
+++ b/bin/passwd.import
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -Tw
-# $Id: passwd.import,v 1.2 2002-06-21 09:11:09 ivan Exp $
+# $Id: passwd.import,v 1.5 2002-06-21 09:57:05 ivan Exp $
 
 use strict;
 use vars qw(%part_svc);
@@ -7,7 +7,7 @@ use Date::Parse;
 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;
 
@@ -19,7 +19,7 @@ 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;
-$FS::svc_acct::noexport_hack = 1;
+$FS::svc_Common::noexport_hack = 1;
 
 ###
 
@@ -86,10 +86,10 @@ while (<PASSWD>) {
 
   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,