X-Git-Url: http://git.home-dn.net/?p=manu%2Fsmtpt.git;a=blobdiff_plain;f=smtpt;h=5021c716af0e6fe68a694aee1bf43b0d14c75008;hp=f392ca90030bb79f86ffb94fc9392d7c0b446590;hb=f4890a7acf0fced6dc6cc2808d5fd8a89e10aee5;hpb=f004e480a4128946bb0d2e96d07f9a718e0a53e1

diff --git a/smtpt b/smtpt
index f392ca9..5021c71 100755
--- a/smtpt
+++ b/smtpt
@@ -4,7 +4,7 @@
 #
 # Require perl modules: Net::SMTP, AppConfig
 #
-# Copyright (C) 2006 Emmanuel Lacour <elacour@home-dn.net>
+# Copyright (C) 2006-2010 Emmanuel Lacour <elacour@home-dn.net>
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
@@ -40,7 +40,7 @@ my %sample;
 # Spam sample email
 $sample{spam} = 'Subject: Test spam mail (GTUBE)
 From: Sender <{FROM}>
-To: Recipient <{TO}>
+To: {TO}
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
@@ -65,7 +65,7 @@ You should send this test mail from an account outside of your network.
 # Nospam/novirus sample email
 $sample{normal} = 'Subject: Test mail nospam/novirus
 From: Sender <{FROM}>
-To: Recipient <{TO}>
+To: {TO}
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 Content-Transfer-Encoding: 7bit
@@ -76,7 +76,7 @@ Essai  nospam/novirus
 
 # Virus sample email
 $sample{virus} = 'From: Sender <{FROM}>
-To: Recipient <{TO}>
+To: {TO}
 Subject: Test virus
 Mime-Version: 1.0
 Content-Type: multipart/mixed; boundary="C7zPtVaVf+AK4Oqc"
@@ -103,8 +103,8 @@ X5O!P%@AP[4{DEACTIVATED}\PZX54(P^)7CC)7}$EICAR-STANDARD-ANTIVIRUS-TEST-FILE!$H+H
 
 # Close properly smtp connection before exiting on error
 sub error {
-    my $mesg = $@;
-    print STDERR $mesg;
+    my $mesg = shift;
+    print STDERR "E: ", $mesg;
     if ($smtp) {
         $smtp->quit();
     }
@@ -149,7 +149,7 @@ sub main {
     my $appconfig = AppConfig->new(
         'host=s', 
         'from=s', 
-        'to=s', 
+        'to=s@',
         'spam=s', 
         'virus=s', 
         'normal=s', 
@@ -171,7 +171,8 @@ sub main {
 
     my $host = $opt{host};
     my $from = $opt{from};
-    my $to = $opt{to};
+    my @to = @{$opt{to}};
+    my $to_formatted = join(", ", @to);
     $count{spam} = $opt{spam};
     $count{virus} = $opt{virus};
     $count{normal} = $opt{normal};
@@ -202,13 +203,13 @@ sub main {
     foreach my $type (keys%count) {
         my $i = 0;
         while ($i < $count{$type}) {
-            print "Sending: $from -> $to, $type\n";
+            print "Sending $type: $from -> $to_formatted\n";
             $smtp->mail($from) or error("From failed: $!\n");
-            $smtp->to($to) or error("To failed: $!\n");
+            $smtp->to(@to) or error("To failed: $!\n");
             $smtp->data() or error("Data failed: $!\n");
             my $sent_size = 0;
             my $body = $sample{$type};
-            $body =~ s/{TO}/$to/g;
+            $body =~ s/{TO}/$to_formatted/g;
             $body =~ s/{FROM}/$from/g;
 	    # Disable special virus mangling (needed for letting people using an http AV download this toool ;))
             $body =~ s/{DEACTIVATED}//g;