On Wed, Aug 12, 2015 at 01:39:44AM +0200, Jan Viktorin wrote: > When sending an e-mail, the client and server must agree on an > authentication mechanism. Some servers (due to misconfiguration > or a bug) deny valid credentials for certain mechanisms. In this > patch, a new option --smtp-auth and configuration entry smtpAuth > are introduced. If smtp_auth is defined, it works as a whitelist > of allowed mechanisms for authentication selected from the ones > supported by the installed SASL perl library. > > Signed-off-by: Jan Viktorin <viktorin@xxxxxxxxxxxxxx> > --- > diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt > index f14705e..82c6ae8 100644 > --- a/Documentation/git-send-email.txt > +++ b/Documentation/git-send-email.txt > @@ -171,6 +171,17 @@ Sending > to determine your FQDN automatically. Default is the value of > 'sendemail.smtpDomain'. > > +--smtp-auth=<mechs>:: > + Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting > + forces using only the listed mechanisms. Example: > + > + $ git send-email --smtp-auth="PLAIN LOGIN GSSAPI" ... > + > + If at least one of the specified mechanisms matches the ones advertised by the > + SMTP server and if it is supported by the utilized SASL library, the mechanism > + is used for authentication. If neither 'sendemail.smtpAuth' nor '--smtp-auth' > + is specified, all mechanisms supported by the SASL library can be used. Unfortuantely, this won't format correctly in Asciidoc. The following squash-in fixes it... ---- 8< ---- Subject: [PATCH] fixup! send-email: provide whitelist of SMTP AUTH mechanisms --- Documentation/git-send-email.txt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 82c6ae8..9e4f130 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -174,13 +174,15 @@ Sending --smtp-auth=<mechs>:: Whitespace-separated list of allowed SMTP-AUTH mechanisms. This setting forces using only the listed mechanisms. Example: - - $ git send-email --smtp-auth="PLAIN LOGIN GSSAPI" ... - - If at least one of the specified mechanisms matches the ones advertised by the - SMTP server and if it is supported by the utilized SASL library, the mechanism - is used for authentication. If neither 'sendemail.smtpAuth' nor '--smtp-auth' - is specified, all mechanisms supported by the SASL library can be used. ++ +------ +$ git send-email --smtp-auth="PLAIN LOGIN GSSAPI" ... +------ ++ +If at least one of the specified mechanisms matches the ones advertised by the +SMTP server and if it is supported by the utilized SASL library, the mechanism +is used for authentication. If neither 'sendemail.smtpAuth' nor '--smtp-auth' +is specified, all mechanisms supported by the SASL library can be used. --smtp-pass[=<password>]:: Password for SMTP-AUTH. The argument is optional: If no -- 2.5.0.276.gf5e568e -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html