From b8e65546c552c637b53d212a16e39b105a4437d3 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Wed, 7 Feb 2001 00:47:42 +0000 Subject: Obvious bug fixes for 5.6.3. svn path=/trunk/; revision=3022 --- imap.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'imap.c') diff --git a/imap.c b/imap.c index 39868ad5..57145194 100644 --- a/imap.c +++ b/imap.c @@ -897,16 +897,6 @@ int imap_getauth(int sock, struct query *ctl, char *greeting) else 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")) { -- cgit v1.2.3