From 8036d190629e546818b7418938b4e8fcda3f16a8 Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 9 Nov 2017 14:39:13 -0800 Subject: [PATCH] Email::Sender::Transport::SMTP::TLS is obsolete and being removed from debian, Email::Sender::Transport::SMTP does starttls starting with deb9 "stretch" --- FS/FS/Misc.pm | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 669c44e70..0e366e8c7 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -109,8 +109,7 @@ use vars qw( $conf ); use Date::Format; use MIME::Entity; use Email::Sender::Simple qw(sendmail); -use Email::Sender::Transport::SMTP; -use Email::Sender::Transport::SMTP::TLS 0.11; +use Email::Sender::Transport::SMTP 1.300027; #for SSL/TLS support use FS::UID; FS::UID->install_callback( sub { @@ -249,17 +248,17 @@ sub send_email { my($port, $enc) = split('-', ($conf->config('smtp-encryption') || '25') ); $smtp_opt{'port'} = $port; - my $transport; if ( defined($enc) && $enc eq 'starttls' ) { - $smtp_opt{$_} = $conf->config("smtp-$_") for qw(username password); - $transport = Email::Sender::Transport::SMTP::TLS->new( %smtp_opt ); - } else { - if ( $conf->exists('smtp-username') && $conf->exists('smtp-password') ) { - $smtp_opt{"sasl_$_"} = $conf->config("smtp-$_") for qw(username password); - } - $smtp_opt{'ssl'} = 1 if defined($enc) && $enc eq 'tls'; - $transport = Email::Sender::Transport::SMTP->new( %smtp_opt ); + $smtp_opt{'ssl'} = 'starttls'; + } elsif ( defined($enc) && $enc eq 'tls' ) { + $smtp_opt{'ssl'} = 'ssl'; } + + if ( $conf->exists('smtp-username') && $conf->exists('smtp-password') ) { + $smtp_opt{"sasl_$_"} = $conf->config("smtp-$_") for qw(username password); + } + + my $transport = Email::Sender::Transport::SMTP->new( %smtp_opt ); push @to, $options{bcc} if defined($options{bcc}); # fully unpack all addresses found in @to (including Bcc) to make the -- 2.11.0