From: Ted Zlatanov Date: Sat, 18 Oct 2014 01:02:30 +0000 (-0400) Subject: net/gnutls.el: pass correct data to `gnutls-boot'. X-Git-Tag: emacs-25.0.90~2635^2~679^2~26 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6c854f07d1a6cbe46bd5a5a9dd3910c87b418d93;p=emacs.git 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 . --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e12b0090936..0da7f2877e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-10-18 Teodor Zlatanov + + * 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 . + 2014-10-18 Michal Nazarewicz * whitespace.el (whitespace-style, whitespace-big-indent) diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 0c650f38d95..3ad92c4607a 100644 --- 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))