From: weasel Date: Wed, 1 Mar 2006 15:01:44 +0000 (+0000) Subject: Revert r264 X-Git-Url: https://git.sthu.org/?p=pgp-tools.git;a=commitdiff_plain;h=ff38a561c7c7346e088faf334083daecae580a86 Revert r264 git-svn-id: svn://svn.debian.org/pgp-tools/trunk@266 b513b33f-fedd-0310-b452-c3deb5f4c849 --- diff --git a/caff/caff b/caff/caff index bb687a2..47c4ec8 100755 --- a/caff/caff +++ b/caff/caff @@ -245,15 +245,6 @@ Add a Reply-To: header to messages sent. Default: none. Address to send blind carbon copies to when sending mail. Default: none. -=item B [string] - -Send mail through specified SMTP server. Default: none (uses -sendmail). - -=item B [string] - -Use specified port for sending mail to SMTP server. Default : 25. - =back =head1 AUTHORS @@ -779,14 +770,7 @@ sub send_mail($$$@) { $message_entity->head->add("Reply-To", $CONFIG{'reply-to'}) if defined $CONFIG{'reply-to'}; $message_entity->head->add("Bcc", $CONFIG{'bcc'}) if defined $CONFIG{'bcc'}; $message_entity->head->add("User-Agent", $USER_AGENT); - - if($CONFIG{'smtp-server'}) { - $message_entity->smtpsend(Host => $CONFIG{'smtp-server'}, - ($CONFIG{'smtp-port'} ? (Port => $CONFIG{'smtp-port'}) : ()), - MailFrom => $CONFIG{'email'}); - } else { - $message_entity->send(); - } + $message_entity->send(); $message_entity->stringify(); };