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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03ba24a4d4120c6e24565d8c5ac498f4ed7186f2..91d2bba2b52481792c0b4caaaa34ff79e216e9f5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/gnutls.el (gnutls-negotiate): Ignore files found via
+       'file-name-handler-alist' since the gnutls library can't use those
+       (bug#15866).
+
 2014-12-08  Dmitry Gutov  <dgutov@yandex.ru>
 
        * vc/vc-hg.el (vc-hg-dir-status-files): Only include ignores files

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index cf8e6a48cb484ad64410199c80f65c6285ae5f2b..200d355f6fd726249186708804e922af4e5c9246 100644 (file)
--- 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))