GSSAPI and ODMR fixes.

svn path=/trunk/; revision=3575

1 files changed, 4 insertions, 0 deletions

diff --git a/sink.c b/sink.c
index 0951e9ca..ffd7a1f9 100644
--- 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);