> Or give an estimate how difficult it would be for me to fix after pointing me in the right direction?
> (I'm willing to learn a little perl for this, but not too much :-p)
> ---
> git-send-email.perl | 64 +++++++++++++++++++++++++++++++++-----------------
> 1 files changed, 42 insertions(+), 22 deletions(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 96051bc..5cf220f 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -88,6 +88,9 @@ Options:
>
> --smtp-ssl If set, connects to the SMTP server using SSL.
>
> + --smtp-tls If set, connects to the SMTP server using TLS.
> + Overrides --smtp-ssl.
> +
> --suppress-from Suppress sending emails to yourself if your address
> appears in a From: line. Defaults to off.
>
> @@ -175,7 +178,7 @@ my ($quiet, $dry_run) = (0, 0);
>
> # Variables with corresponding config settings
> my ($thread, $chain_reply_to, $suppress_from, $signed_off_cc, $cc_cmd);
> -my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_authpass, $smtp_ssl);
> +my ($smtp_server, $smtp_server_port, $smtp_authuser, $smtp_authpass, $smtp_ssl, $smtp_tls);
> my ($identity, $aliasfiletype, @alias_files, @smtp_host_parts);
>
> my %config_bool_settings = (
> @@ -184,6 +187,7 @@ my %config_bool_settings = (
> "suppressfrom" => [$suppress_from, 0],
> "signedoffcc" => [$signed_off_cc, 1],
> "smtpssl" => [$smtp_ssl, 0],
> + "smtptls" => [$smtp_tls, 0],
> );
>
> my %config_settings = (
> @@ -213,6 +217,7 @@ my $rc = GetOptions("sender|from=s" => $sender,
> "smtp-user=s" => $smtp_authuser,
> "smtp-pass=s" => $smtp_authpass,
> "smtp-ssl!" => $smtp_ssl,
> + "smtp-tls!" => $smtp_tls,
> "identity=s" => $identity,
> "compose" => $compose,
> "quiet" => $quiet,
> @@ -613,31 +618,46 @@ X-Mailer: git-send-email $gitversion
> die "The required SMTP server is not properly defined."
> }
>
> - if ($smtp_ssl) {
> - $smtp_server_port ||= 465; # ssmtp
> - require Net::SMTP::SSL;
> - $smtp ||= Net::SMTP::SSL->new($smtp_server, Port => $smtp_server_port);
> + if ($smtp_tls) {
> + require Net::SMTP::TLS;
> + $smtp ||= Net::SMTP::TLS->new(
> + $smtp_server,
> + Port => $smtp_server_port,
> + User => $smtp_authuser,
> + Password=> $smtp_authpass);
> +
> + $smtp->mail( $raw_from );
> + $smtp->to( @recipients );
> + $smtp->data;
> + $smtp->datasend("$header\n$message");
> + $smtp->dataend();
> }
> else {
> - require Net::SMTP;
> - $smtp ||= Net::SMTP->new((defined $smtp_server_port)
> - ? "$smtp_server:$smtp_server_port"
> - : $smtp_server);
> - }
> + if ($smtp_ssl) {
> + require Net::SMTP::SSL;
> + $smtp ||= Net::SMTP::SSL->new($smtp_server, Port => $smtp_server_port);
> + }
> + else {
> + require Net::SMTP;
> + $smtp ||= Net::SMTP->new((defined $smtp_server_port)
> + ? "$smtp_server:$smtp_server_port"
> + : $smtp_server);
> + }
>
> - if (!$smtp) {
> - die "Unable to initialize SMTP properly. Is there something wrong with your config?";
> - }
> + if (!$smtp) {
> + die "Unable to initialize SMTP properly. Is there something wrong with your config?";
> + }
>
> - if ((defined $smtp_authuser) && (defined $smtp_authpass)) {
> - $smtp->auth( $smtp_authuser, $smtp_authpass ) or die $smtp->message;
> + if ((defined $smtp_authuser) && (defined $smtp_authpass)) {
> + $smtp->auth( $smtp_authuser, $smtp_authpass ) or die $smtp->message;
> + }
> + $smtp->mail( $raw_from ) or die $smtp->message;
> + $smtp->to( @recipients ) or die $smtp->message;
> + $smtp->data or die $smtp->message;
> + $smtp->datasend("$header\n$message") or die $smtp->message;
> + $smtp->dataend() or die $smtp->message;
> + $smtp->ok or die "Failed to send $subject\n".$smtp->message;
> }
> - $smtp->mail( $raw_from ) or die $smtp->message;
> - $smtp->to( @recipients ) or die $smtp->message;
> - $smtp->data or die $smtp->message;
> - $smtp->datasend("$header\n$message") or die $smtp->message;
> - $smtp->dataend() or die $smtp->message;
> - $smtp->ok or die "Failed to send $subject\n".$smtp->message;
> }
> if ($quiet) {
> printf (($dry_run ? "Dry-" : "")."Sent %s\n", $subject);
> @@ -651,7 +671,7 @@ X-Mailer: git-send-email $gitversion
> print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
> }
> print "From: $sanitized_sender\nSubject: $subject\nCc: $cc\nTo: $to\n\n";
> - if ($smtp) {
> + if ($smtp && !$smtp_tls) {
> print "Result: ", $smtp->code, ' ',
> ($smtp->message =~ /\n([^\n]+\n)$/s), "\n";
> } else {
> --
> 1.5.3.4.498.g9c514
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to
majordomo@vger.kernel.org
> More majordomo info at
http://vger.kernel.org/majordomo-info.html
>