diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2017-12-04 17:24:32 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2017-12-04 17:24:32 -0800 |
| commit | 12c0f8134129c1fedd9580beb7bb13b2c0e9bd8a (patch) | |
| tree | 2409879802decb19643fbd47fc7d2275d6e56484 | |
| parent | ec8be6c17823eadf046438cce7925329e653c17a (diff) | |
Revert "Email::Sender::Transport::SMTP::TLS is obsolete and being removed from debian, Email::Sender::Transport::SMTP does starttls starting with deb9 "stretch""
This reverts commit 8036d190629e546818b7418938b4e8fcda3f16a8.
| -rw-r--r-- | FS/FS/Misc.pm | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/FS/FS/Misc.pm b/FS/FS/Misc.pm index 0e366e8..669c44e 100644 --- a/FS/FS/Misc.pm +++ b/FS/FS/Misc.pm @@ -109,7 +109,8 @@ use vars qw( $conf ); use Date::Format; use MIME::Entity; use Email::Sender::Simple qw(sendmail); -use Email::Sender::Transport::SMTP 1.300027; #for SSL/TLS support +use Email::Sender::Transport::SMTP; +use Email::Sender::Transport::SMTP::TLS 0.11; use FS::UID; FS::UID->install_callback( sub { @@ -248,18 +249,18 @@ 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{'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); + $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 ); } - 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 # envelope list |