X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=bin%2Fsvc_acct_sm.import;h=0714af3f190e338aa15f31adca8afb87db34ae3a;hb=d220c8a4bfa1aee8f17ed71c2dba655160dd3595;hp=8777abe7edd8539deae2e9ecd4b370a55489a01a;hpb=958222ad6b9e290ef4db7e0ab3f1ead6bd3fcb7f;p=freeside.git

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index 8777abe7e..0714af3f1 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.6 2000-06-29 10:48:25 ivan Exp $
+# $Id: svc_acct_sm.import,v 1.8 2000-12-03 15:14:00 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.6  2000-06-29 10:48:25  ivan
+# Revision 1.8  2000-12-03 15:14:00  ivan
+# bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!
+#
+# Revision 1.7  2000/06/29 10:51:52  ivan
+# oops, silly mistake
+#
+# Revision 1.6  2000/06/29 10:48:25  ivan
 # make svc_acct_sm skip blank lines in sendmail import
 #
 # Revision 1.5  2000/02/03 05:16:52  ivan
@@ -129,8 +135,9 @@ END
 sub getvalue {
   my $prompt = shift;
   $^W=0; #Term::Query isn't -w-safe
-  query $prompt, '';
+  my $data = query $prompt, '';
   $^W=1;
+  $data;
 }
 
 print "\n\n";
@@ -248,7 +255,7 @@ END
   while (<VIRTUSERTABLE>) {
     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);