projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert r264
[pgp-tools.git]
/
caff
/
caff
diff --git
a/caff/caff
b/caff/caff
index bb687a289b97768ce8aa38bc0d385bb0b4c19ab3..47c4ec89802c7211bfe5f46f18ab63d951fc3dd9 100755
(executable)
--- 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.
Address to send blind carbon copies to when sending mail.
Default: none.
-=item B<smtp-server> [string]
-
-Send mail through specified SMTP server. Default: none (uses
-sendmail).
-
-=item B<smtp-port> [string]
-
-Use specified port for sending mail to SMTP server. Default : 25.
-
=back
=head1 AUTHORS
=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);
$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();
};
$message_entity->stringify();
};