From: Ted Zlatanov <tzz@lifelogs.com>
Date: Tue, 14 Feb 2012 13:13:24 +0000 (-0500)
Subject: (gnutls-trustfiles): Add Cygwin location.
X-Git-Tag: emacs-pretest-24.0.94~142
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=08dcdbc94a7eb803833087c6b316131282628207;p=emacs.git

(gnutls-trustfiles): Add Cygwin location.

* net/gnutls.el (gnutls-trustfiles): Add Cygwin location.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5c7e8f2e8f8..94f5ebcb600 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* net/gnutls.el (gnutls-trustfiles): Add Cygwin location.
+
 2012-02-13  Glenn Morris  <rgm@gnu.org>
 
 	* minibuffer.el (read-file-name): Doc fix.  (Bug#10798)
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 9b734637103..2fd276cf1c6 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -56,6 +56,7 @@ set this variable to \"normal:-dhe-rsa\"."
     "/etc/ssl/certs/ca-certificates.crt" ; Debian, Ubuntu, Gentoo and Arch Linux
     "/etc/pki/tls/certs/ca-bundle.crt"   ; Fedora and RHEL
     "/etc/ssl/ca-bundle.pem"             ; Suse
+    "/usr/ssl/cert/ca-bundle.crt"        ; Cygwin
     )
   "List of CA bundle location filenames or a function returning said list.
 The files may be in PEM or DER format, as per the GnuTLS documentation.