aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/net/gnutls.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e4310dd5fe8..10db215a989 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-12-13 Romain Francoise <romain@orebokech.com>
2
3 * net/gnutls.el (gnutls-negotiate): Fix setting of default trustfiles.
4
12010-12-13 Eli Zaretskii <eliz@gnu.org> 52010-12-13 Eli Zaretskii <eliz@gnu.org>
2 6
3 * subr.el (posn-col-row): Evaluate header-line-format in the 7 * subr.el (posn-col-row): Evaluate header-line-format in the
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 85c546ffd3f..e49af2948e6 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -77,7 +77,7 @@ PRIORITY-STRING is as per the GnuTLS docs, default is \"NORMAL\".
77TRUSTFILES is a list of CA bundles. 77TRUSTFILES is a list of CA bundles.
78KEYFILES is a list of client keys." 78KEYFILES is a list of client keys."
79 (let* ((type (or type 'gnutls-x509pki)) 79 (let* ((type (or type 'gnutls-x509pki))
80 (trusfiles (or trustfiles 80 (trustfiles (or trustfiles
81 '("/etc/ssl/certs/ca-certificates.crt"))) 81 '("/etc/ssl/certs/ca-certificates.crt")))
82 (priority-string (or priority-string 82 (priority-string (or priority-string
83 (cond 83 (cond