diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-02-13 13:38:19 -0800 |
| commit | 7c9b668b83c68f14d7249170a0609554a7b4a0fe (patch) | |
| tree | bcf72c01eb8754b5b582bd71f630bb028e3a252b | |
| parent | 90791e3416e24a98b38d95e249f3a61fb20a632f (diff) | |
| parent | 01645b749376b7026276112d69d5b9c22b000ee4 (diff) | |
| download | git-7c9b668b83c68f14d7249170a0609554a7b4a0fe.tar.gz git-7c9b668b83c68f14d7249170a0609554a7b4a0fe.tar.xz | |
Merge branch 'rk/send-email-ssl-cert' into maint
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
| -rwxr-xr-x | git-send-email.perl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl index 2016d9c61..fdb0029b5 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -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 "") { |