summaryrefslogtreecommitdiff
path: root/lisp/net/gnutls.el
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <larsi@gnus.org>2014-12-08 19:13:30 +0100
committerLars Magne Ingebrigtsen <larsi@gnus.org>2014-12-08 19:13:39 +0100
commite63c720b728e627f86da825d42dc592186429cbc (patch)
tree7a7b731476fe748e647e15456f2174e641559f05 /lisp/net/gnutls.el
parent2354db7f53c25cfdac1b9436bbc56a54f16253f0 (diff)
downloademacs-e63c720b728e627f86da825d42dc592186429cbc.tar.gz
emacs-e63c720b728e627f86da825d42dc592186429cbc.tar.bz2
emacs-e63c720b728e627f86da825d42dc592186429cbc.zip
Make gnutls-negotiate ignore specially handled files
Fixes: debbugs:15866 * lisp/net/gnutls.el (gnutls-negotiate): Ignore files found via 'file-name-handler-alist' since the gnutls library can't use those.
Diffstat (limited to 'lisp/net/gnutls.el')
-rw-r--r--lisp/net/gnutls.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index cf8e6a48cb4..200d355f6fd 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -189,6 +189,9 @@ here's a recent version of the list.
It must be omitted, a number, or nil; if omitted or nil it
defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
(let* ((type (or type 'gnutls-x509pki))
+ ;; The gnutls library doesn't understand files delivered via
+ ;; the special handlers, so ignore all files found via those.
+ (file-name-handler-alist nil)
(trustfiles (or trustfiles
(delq nil
(mapcar (lambda (f) (and f (file-exists-p f) f))