[Pgp-tools-commit] r265 - in trunk: caff debian

[Thijs Kinkhorst]

Author: kink-guest
Date: 2006-03-01 14:49:51 +0000 (Wed, 01 Mar 2006)
New Revision: 265

Modified:
   trunk/caff/caff
   trunk/debian/changelog
Log:
caff: support using a SMTP-server to send out the mails instead
of a local MTA.
Patch provided by Mathias Brossard (by private email, why are people
not filing bugs?), change is simple enough to provide the option.


Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2006-02-28 17:42:48 UTC (rev 264)
+++ trunk/caff/caff	2006-03-01 14:49:51 UTC (rev 265)
@@ -245,6 +245,15 @@
 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
@@ -770,7 +779,14 @@
 	$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->send();
+
+	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->stringify();
 };
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-28 17:42:48 UTC (rev 264)
+++ trunk/debian/changelog	2006-03-01 14:49:51 UTC (rev 265)
@@ -7,11 +7,13 @@
   * gpg-key2ps, keylookup: make them less dependent on specific
     installation paths and thus better portable outside of Debian
     (Closes: #354142).
+  * caff: support using a SMTP-server to send out the mails instead
+    of a local MTA. Thanks Mathias Brossard for the patch.
 
   [ Christoph Berg ]
   * caff: note that mailed keys are encrypted (suggested by Sune Vuorela).
 
- -- Thijs Kinkhorst <kink at squirrelmail.org>  Tue, 28 Feb 2006 18:41:13 +0100
+ -- Thijs Kinkhorst <kink at squirrelmail.org>  Wed,  1 Mar 2006 15:47:33 +0100
 
 signing-party (0.4.4-2) unstable; urgency=low