Skip to content

Commit

Permalink
Merge branch 'rk/send-email-ssl-cert' into maint
Browse files Browse the repository at this point in the history
A recent update to "git send-email" broke platforms where
/etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path
(e.g. Fedora rawhide).

* rk/send-email-ssl-cert:
  send-email: /etc/ssl/certs/ directory may not be usable as ca_path
  • Loading branch information
Junio C Hamano committed Feb 13, 2014
2 parents 90791e3 + 01645b7 commit 7c9b668
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-send-email.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,8 @@ sub ssl_verify_params {
}

if (!defined $smtp_ssl_cert_path) {
$smtp_ssl_cert_path = "/etc/ssl/certs";
# use the OpenSSL defaults
return (SSL_verify_mode => SSL_VERIFY_PEER());
}

if ($smtp_ssl_cert_path eq "") {
Expand Down

0 comments on commit 7c9b668

Please sign in to comment.