net/gnutls.el: pass correct data to `gnutls-boot'.

* net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
correct data to `gnutls-boot'.
Reported by Toke Høiland-Jørgensen <toke@toke.dk>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e12b00909366b83ba2c491184d906dcefa662c9f..0da7f2877e10572611c13b061df49838e51dd2b8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
+       correct data to `gnutls-boot' (Bug#18664).
+       Reported by Toke Høiland-Jørgensen <toke@toke.dk>.
+
 2014-10-18  Michal Nazarewicz  <mina86@mina86.com>
 
        * whitespace.el (whitespace-style, whitespace-big-indent)

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 0c650f38d9526912b0853cc874fbb101afecb8b6..3ad92c4607a7b7de05edb0f834558825d6d3386d 100644 (file)
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -211,11 +211,13 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
                              t)
                             ;; if a list, look for hostname matches
                             ((listp gnutls-verify-error)
-                             (cl-mapcan
-                              (lambda (check)
-                                (when (string-match (car check) hostname)
-                                  (copy-sequence (cdr check))))
-                              gnutls-verify-error))
+                             (apply 'append
+                                    (mapcar
+                                     (lambda (check)
+                                       (when (string-match (nth 0 check)
+                                                           hostname)
+                                         (nth 1 check)))
+                                     gnutls-verify-error)))
                             ;; else it's nil
                             (t nil))))
          (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))