Synch with Emacs trunk.

proto-stream.el (proto-stream-open-starttls): Give host parameter to `gnutls-negotiate'.
 (gnutls-negotiate): Adjust `gnutls-negotiate' declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d30adb1..e37fae3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,12 @@
        * gnus-registry.el (gnus-registry-ignore-group-p): Don't call
        `gnus-parameter-registry-ignore' if the *Group* buffer doesn't exist.
 
+2011-04-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * proto-stream.el (proto-stream-open-starttls): Give host parameter to
+       `gnutls-negotiate'.
+       (gnutls-negotiate): Adjust `gnutls-negotiate' declaration.
+
 2011-04-23  Glenn Morris  <rgm@gnu.org>
 
        * gnus-sum.el (gnus-extra-headers): Bump :version.

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 0a055d0..e7718a5 100644 (file)
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -52,7 +52,8 @@
 (require 'starttls)
 
 (declare-function gnutls-negotiate "gnutls"
-                 (proc type &optional priority-string trustfiles keyfiles))
+                  (proc type host &optional priority-string trustfiles keyfiles
+                        verify-flags verify-error verify-hostname-error))
 
 ;;;###autoload
 (defun open-protocol-stream (name buffer host service &rest parameters)
@@ -186,7 +187,7 @@ PARAMETERS should be a sequence of keywords and values:
                          (proto-stream-command stream starttls-command eoc))
        ;; The server said it was OK to begin STARTTLS negotiations.
        (if (fboundp 'open-gnutls-stream)
-           (gnutls-negotiate stream nil)
+           (gnutls-negotiate stream nil host)
          (unless (starttls-negotiate stream)
            (delete-process stream)))
        (if (memq (process-status stream) '(open run))