Merge branch 'rk/send-email-ssl-cert' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:38:19 +0000 (13:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Feb 2014 21:38:19 +0000 (13:38 -0800)
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

git-send-email.perl
index 2016d9c6198957943a8bd2510e217fe72412062a..fdb0029b597898559376b1b28d692450794251f3 100755 (executable)
@@ -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 "") {