aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Lang2014-07-01 20:48:24 +0200
committerMario Lang2014-07-01 20:48:24 +0200
commitdd72a0ca5519d4b0c635aebcd537232ca007cde0 (patch)
tree116d10a40c68868e704834d122fc5e0fd99f82fe
parent6372fc12fe9c5d22a825e2c812c4a788cda175f6 (diff)
downloademacs-dd72a0ca5519d4b0c635aebcd537232ca007cde0.tar.gz
emacs-dd72a0ca5519d4b0c635aebcd537232ca007cde0.zip
* net/gnutls.el (gnutls-negotiate): Prevent destructive modification of
customization option `gnutls-verify-error.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/gnutls.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f279c7b454..1300cd7b8b8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12014-07-01 Mario Lang <mlang@delysid.org>
2
3 * net/gnutls.el (gnutls-negotiate): Prevent destructive modification of
4 cosutomization option `gnutls-verify-error'.
5
12014-07-01 Stefan Monnier <monnier@iro.umontreal.ca> 62014-07-01 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * simple.el (deactivate-mark, set-mark-command, handle-shift-selection): 8 * simple.el (deactivate-mark, set-mark-command, handle-shift-selection):
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index ea4c0351be7..0c650f38d95 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -214,7 +214,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
214 (cl-mapcan 214 (cl-mapcan
215 (lambda (check) 215 (lambda (check)
216 (when (string-match (car check) hostname) 216 (when (string-match (car check) hostname)
217 (cdr check))) 217 (copy-sequence (cdr check))))
218 gnutls-verify-error)) 218 gnutls-verify-error))
219 ;; else it's nil 219 ;; else it's nil
220 (t nil)))) 220 (t nil))))