From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Drew DeVault <sir@cmpwn.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 3/3] git-send-email: rename 'tls' to 'starttls'
Date: Sun, 11 Apr 2021 16:17:17 +0200 [thread overview]
Message-ID: <87eefggb2q.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20210411125431.28971-4-sir@cmpwn.com>
On Sun, Apr 11 2021, Drew DeVault wrote:
> The name 'tls' is misleading. The 'ssl' option enables a generic
> "modern" encryption stack which might very well use TLS; but the 'tls'
> option enables STARTTLS support, which works entirely differently.
>
> This renames the canonical option to 'starttls', to make this
> distinction more obvious, and adds 'tls' as an alias for starttls, to
> avoid breaking config files.
>
> Signed-off-by: Drew DeVault <sir@cmpwn.com>
> ---
> Documentation/git-send-email.txt | 6 ++++--
> git-send-email.perl | 10 +++++++---
> 2 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
> index 520b355e50..f8cea9e1f9 100644
> --- a/Documentation/git-send-email.txt
> +++ b/Documentation/git-send-email.txt
> @@ -168,12 +168,14 @@ Sending
> unspecified, choosing the envelope sender is left to your MTA.
>
> --smtp-encryption=<encryption>::
> - Specify the encryption to use, either 'ssl' or 'tls'. 'ssl' enables
> - generic SSL/TLS support and is typically used on port 465. 'tls'
> + Specify the encryption to use, either 'ssl' or 'starttls'. 'ssl' enables
> + generic SSL/TLS support and is typically used on port 465. 'starttls'
> enables in-band STARTTLS support and is typically used on port 25 or
> 587. Use whichever option is recommended by your mail provider. Leave
> empty to disable encryption and use plain SMTP. Default is the value of
> `sendemail.smtpEncryption`.
> ++
> +'tls' is an alias for 'starttls' for legacy reasons.
>
> --smtp-domain=<FQDN>::
> Specifies the Fully Qualified Domain Name (FQDN) used in the
> diff --git a/git-send-email.perl b/git-send-email.perl
> index bda5211f0d..3f125bc2b8 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -495,8 +495,12 @@ sub read_config {
>
> # 'default' encryption is none -- this only prevents a warning
> $smtp_encryption = '' unless (defined $smtp_encryption);
> -if ($smtp_encryption ne "" && $smtp_encryption ne "ssl" && $smtp_encryption ne "tls") {
> - die __("Invalid smtp_encryption configuration: expected 'ssl', 'tls', or nothing.\n");
> +if ($smtp_encryption eq "tls") {
> + # "tls" is an alias for starttls for legacy reasons
> + $smtp_encryption = "starttls";
> +};
Needless trailing ";".
This and the preceding patch would be more readable if it was
re-arranged in some way as to not rewrite the newly introduced lines
between 2 and 3, maybe:
{
my $tls_name = "tls";
if (....)
}
Then you'd only need to change "tls" to "starttls" there.
> +if ($smtp_encryption ne "" && $smtp_encryption ne "ssl" && $smtp_encryption ne "starttls") {
> + die __("Invalid smtp_encryption configuration: expected 'ssl', 'starttls', or nothing.\n");
> }
>
> # Set CC suppressions
> @@ -1541,7 +1545,7 @@ sub send_message {
> Hello => $smtp_domain,
> Debug => $debug_net_smtp,
> Port => $smtp_server_port);
> - if ($smtp_encryption eq 'tls' && $smtp) {
> + if ($smtp_encryption eq 'starttls' && $smtp) {
And this could use the same variable.
next prev parent reply other threads:[~2021-04-11 14:17 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 12:54 [PATCH v2 0/3] git-send-email: improve SSL configuration Drew DeVault
2021-04-11 12:54 ` [PATCH v2 1/3] git-send-email(1): improve smtp-encryption docs Drew DeVault
2021-04-11 14:11 ` Ævar Arnfjörð Bjarmason
2021-04-11 12:54 ` [PATCH v2 2/3] git-send-email: die on invalid smtp_encryption Drew DeVault
2021-04-11 14:20 ` Ævar Arnfjörð Bjarmason
2021-04-11 14:21 ` Drew DeVault
2021-04-11 14:30 ` Ævar Arnfjörð Bjarmason
2021-04-11 15:06 ` Ævar Arnfjörð Bjarmason
2021-04-11 15:18 ` Drew DeVault
2021-04-11 19:56 ` Ævar Arnfjörð Bjarmason
2021-04-12 12:33 ` Drew DeVault
2021-04-12 13:16 ` Ævar Arnfjörð Bjarmason
2021-04-13 12:12 ` Drew DeVault
2021-04-13 14:22 ` Ævar Arnfjörð Bjarmason
2021-04-13 21:39 ` Junio C Hamano
2021-04-11 12:54 ` [PATCH v2 3/3] git-send-email: rename 'tls' to 'starttls' Drew DeVault
2021-04-11 14:17 ` Ævar Arnfjörð Bjarmason [this message]
2021-04-11 14:22 ` Drew DeVault
2021-04-11 14:43 ` [PATCH 0/2] send-email: simplify smtp.{smtpssl,smtpencryption} parsing Ævar Arnfjörð Bjarmason
2021-04-11 14:43 ` [PATCH 1/2] send-email: remove non-working support for "sendemail.smtpssl" Ævar Arnfjörð Bjarmason
2021-04-11 19:08 ` Junio C Hamano
2021-04-11 19:51 ` Ævar Arnfjörð Bjarmason
2021-05-01 9:15 ` Ævar Arnfjörð Bjarmason
2021-04-11 14:43 ` [PATCH 2/2] send-email: refactor sendemail.smtpencryption config parsing Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eefggb2q.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=sir@cmpwn.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).