summaryrefslogtreecommitdiff
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-27 10:44:34 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-27 10:44:34 -0800
commitde20e4472157d0ed53bdc6374185a2ce3c7c9f3d (patch)
tree365e5ad12a64158b356b58418ffdb55edb70931e /git-send-email.perl
parenta0f4525ae088eab15bf5ea2551df5ce2b20d28c4 (diff)
parent01645b749376b7026276112d69d5b9c22b000ee4 (diff)
downloadgit-de20e4472157d0ed53bdc6374185a2ce3c7c9f3d.tar.gz
Merge branch 'rk/send-email-ssl-cert'
The "if /etc/ssl/certs/ directory exists, explicitly telling the library to use it as SSL_ca_path" blind-defaulting in "git send-email" broke platforms where /etc/ssl/certs/ directory exists, but it cannot used as SSL_ca_path (e.g. Fedora rawhide). Fix it by not specifying any SSL_ca_path/SSL_ca_file but still asking for peer verification in such a case. * rk/send-email-ssl-cert: send-email: /etc/ssl/certs/ directory may not be usable as ca_path
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index 2016d9c619..fdb0029b59 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 "") {