GSSAPI and ODMR fixes.

svn path=/trunk/; revision=3575

diff --git a/Makefile.in b/Makefile.in
index fe0cd9af563c34fa6246e0a720ca88ba71098025..cdc91945fd54a30b6676e25ce8fae6ea5748be04 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 PACKAGE = fetchmail
-VERSION = 5.9.6
+VERSION = 5.9.7
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@

diff --git a/NEWS b/NEWS
index 39b012843af16178caee3a6ed798652dc566065b..f23b793906637450f3e202176b2351f366637f1f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@
 * UIDL bug fix by Matthias Andree.
 * Use smtpaddress, if present, to set the return path on warning mail.
 * Tell parser to object when SSL keyboard is used with SSL not compiled.
+* GSSAPI and ODMR fixes by Tom Hughes.
 
 fetchmail-5.9.6 (Fri Dec 14 04:03:50 EST 2001), 21247 lines:
 

diff --git a/sink.c b/sink.c
index 0951e9ca62c02c5597058166f5182d02859ae9a1..ffd7a1f9da6decfa7eb000b1fd7e0c5540ebc455 100644 (file)
--- a/sink.c
+++ b/sink.c
@@ -143,7 +143,11 @@ int smtp_open(struct query *ctl)
 
            /* return immediately for ODMR */
            if (ctl->server.protocol == P_ODMR)
+           {
+              set_timeout(0);
+              phase = oldphase;
                return(ctl->smtp_socket); /* success */
+           }
 
            /* are we doing SMTP or LMTP? */
            SMTP_setmode(ctl->listener);