2 files changed, 7 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 04f2e6a5752..c91ed1dc74a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-26  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnutls.c (emacs_gnutls_handshake): Return an error if we're not
+        supposed to be handshaking.
+        Reported by Paul Eggert <eggert@cs.ucla.edu>.
+
 2011-04-26  Daniel Colascione <dan.colascione@gmail.com>
 
         * lisp.h (Qdebug): List symbol.
diff --git a/src/gnutls.c b/src/gnutls.c
index 975fe655072..60a4949f431 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -74,7 +74,7 @@ emacs_gnutls_handshake (struct Lisp_Process *proc)
   int ret;
 
   if (proc->gnutls_initstage < GNUTLS_STAGE_HANDSHAKE_CANDO)
-    return;
+    return -1;
 
   if (proc->gnutls_initstage < GNUTLS_STAGE_TRANSPORT_POINTERS_SET)
     {