summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-12 12:34:03 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-12 12:34:03 -0700
commitafc71aa9e62b4bce35472143f063022b13aba3b1 (patch)
treee3cfdc7975da15bcdc27088c8cae6bfc4b221fbc /git-send-email.perl
parenta6045720bdb5faa6bcf7ecf4fa732632202d52ac (diff)
parentccdbdc79a30413d93d32cc7e5293185228f05459 (diff)
downloadgit-afc71aa9e62b4bce35472143f063022b13aba3b1.tar.gz
Merge branch 'zj/send-email-authen-sasl'
* zj/send-email-authen-sasl: send-email: auth plain/login fix
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl6
1 files changed, 6 insertions, 0 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 734356a6fb..8ded7f5ce3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1098,6 +1098,12 @@ X-Mailer: git-send-email $gitversion
}
if (defined $smtp_authuser) {
+ # Workaround AUTH PLAIN/LOGIN interaction defect
+ # with Authen::SASL::Cyrus
+ eval {
+ require Authen::SASL;
+ Authen::SASL->import(qw(Perl));
+ };
if (!defined $smtp_authpass) {