bugfixes from Jeff Finucane <jeff@cmh.net>, thanks!

[freeside.git] / bin / svc_acct_sm.import

diff --git a/bin/svc_acct_sm.import b/bin/svc_acct_sm.import
index bda9762..0714af3 100755 (executable)
--- 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.4 1999-03-25 08:42:20 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,19 @@
 # ivan@sisd.com 98-jul-13
 #
 # $Log: svc_acct_sm.import,v $
-# Revision 1.4  1999-03-25 08:42:20  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
+# beginning of DNS and Apache support
+#
+# Revision 1.4  1999/03/25 08:42:20  ivan
 # import stuff uses Term::Query and spits out (some kinds of) nonsensical input
 #
 # Revision 1.3  1999/03/24 00:51:55  ivan
@@ -123,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";
@@ -148,6 +161,7 @@ my(%svcnum);
 
 while (<RCPTHOSTS>) {
   next if /^(#|$)/;
+  next if $mta{$mta} eq 'sendmail' && /^\s*$/; #blank lines
   /^\.?([\w\-\.]+)$/
     #or do { warn "Strange rcpthosts/sendmail.cw line: $_"; next; };
     or die "Strange rcpthosts/sendmail.cw line: $_";
@@ -240,7 +254,8 @@ END
     or die "Can't open $spooldir/virtusertable.import: $!";
   while (<VIRTUSERTABLE>) {
     next if /^#/; #comments?
-    /^([\w\-\.]+)?\@([\w\-\.]+)\t([\w\-\.]+)$/
+    next if /^\s*$/; #blank lines
+    /^([\w\-\.]+)?\@([\w\-\.]+)\t+([\w\-\.]+)$/
       #or do { warn "Strange virtusertable line: $_"; next; };
       or die "Strange virtusertable line: $_";
     my($domuser,$domain,$username)=($1,$2,$3);
@@ -278,6 +293,6 @@ END
 #
 
 sub usage {
-  die "Usage:\n\n  svc_acct_sm.export user\n";
+  die "Usage:\n\n  svc_acct_sm.import user\n";
 }