X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fsvc_acct_sm.import;h=723fb029fd722b4837d29494fca0791eac6461d1;hb=a03e44937be8d6c2f99dc830ef2583cbbbb36dfc;hp=349c4f26ce34c491991ffb6a023f052afa09ebd0;hpb=543ac5d57838319516d325dbeac898f111065bc3;p=freeside.git diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import index 349c4f26c..723fb029f 100755 --- a/bin/svc_acct_sm.import +++ b/bin/svc_acct_sm.import @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct_sm.import,v 1.7 2000-06-29 10:51:52 ivan Exp $ +# $Id: svc_acct_sm.import,v 1.9 2001-04-22 01:56:15 ivan Exp $ # # ivan@sisd.com 98-mar-9 # @@ -16,7 +16,13 @@ # ivan@sisd.com 98-jul-13 # # $Log: svc_acct_sm.import,v $ -# Revision 1.7 2000-06-29 10:51:52 ivan +# Revision 1.9 2001-04-22 01:56:15 ivan +# get rid of FS::SSH.pm (became Net::SSH and Net::SCP on CPAN) +# +# Revision 1.8 2000/12/03 15:14:00 ivan +# bugfixes from Jeff Finucane , thanks! +# +# Revision 1.7 2000/06/29 10:51:52 ivan # oops, silly mistake # # Revision 1.6 2000/06/29 10:48:25 ivan @@ -38,7 +44,7 @@ use strict; use vars qw(%d_part_svc %m_part_svc); use Term::Query qw(query); -use FS::SSH qw(iscp); +use Net::SCP qw(iscp); use FS::UID qw(adminsuidsetup datasrc); use FS::Record qw(qsearch qsearchs); use FS::svc_acct_sm; @@ -252,7 +258,7 @@ END while () { next if /^#/; #comments? next if /^\s*$/; #blank lines - /^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/ + /^([\w\-\.]+)?\@([\w\-\.]+)\t+([\w\-\.]+)$/ #or do { warn "Strange virtusertable line: $_"; next; }; or die "Strange virtusertable line: $_"; my($domuser,$domain,$username)=($1,$2,$3);