Add debugging to the gnutls library, and finish handshaking when it's done.

2 files changed, 8 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7cde04306b..cd30925d9fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/gnutls.el (starttls-negotiate): Stop looping when we get a t
+        back.
+
 2010-09-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/pcase.el (pcase-let*, pcase-let): plet -> pcase-let.
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 7a2571f8a7c..b393d237d90 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -80,13 +80,11 @@ CREDENTIALS-FILE is a filename with meaning dependent on CREDENTIALS."
 
     (let ((ret 'gnutls-e-again)
           (n 25000))
-      (while (and (not (gnutls-error-fatalp ret))
+      (while (and (not (eq ret t))
+                  (not (gnutls-error-fatalp ret))
                   (> n 0))
         (setq n (1- n))
-        (gnutls-message-maybe
-         (setq ret (gnutls-handshake proc))
-         "handshake: %s")
-        ;(debug "handshake ret" ret (gnutls-error-string ret)))
+        (setq ret (gnutls-handshake proc))
         )
       (if (gnutls-errorp ret)
           (progn