Obvious bug fixes for 5.6.3.

svn path=/trunk/; revision=3022

1 files changed, 10 insertions, 10 deletions

diff --git a/imap.c b/imap.c
index 39868ad5..57145194 100644
--- a/imap.c
+++ b/imap.c
@@ -898,16 +898,6 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
 	expunge_period = 1;
 
     /* 
-     * If either (a) we saw a PREAUTH token in the greeting, or
-     * (b) the user specified ssh preauthentication, then we're done.
-     */
-    if (preauth || ctl->server.preauthenticate == A_SSH)
-    {
-        preauth = FALSE;  /* reset for the next session */
-        return(PS_SUCCESS);
-    }
-
-    /* 
      * Handle idling.  We depend on coming through here on startup
      * and after each timeout (including timeouts during idles).
      */
@@ -918,6 +908,16 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
 	    report(stdout, _("will idle after poll\n"));
     }
 
+    /* 
+     * If either (a) we saw a PREAUTH token in the greeting, or
+     * (b) the user specified ssh preauthentication, then we're done.
+     */
+    if (preauth || ctl->server.preauthenticate == A_SSH)
+    {
+        preauth = FALSE;  /* reset for the next session */
+        return(PS_SUCCESS);
+    }
+
 #if OPIE_ENABLE
     if ((ctl->server.protocol == P_IMAP) && strstr(capabilities, "AUTH=X-OTP"))
     {