Merge branch 'zj/send-email-authen-sasl'

* zj/send-email-authen-sasl: send-email: auth plain/login fix
2011-10-12 12:34:03 -07:00 · 2011-10-12 12:34:03 -07:00 · afc71aa9e6
parent a6045720bd ccdbdc79a3
commit afc71aa9e6
1 changed files with 6 additions and 0 deletions
--- 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) {