LinuxWorld hacks.

svn path=/trunk/; revision=2729

1 files changed, 5 insertions, 1 deletions

diff --git a/imap.c b/imap.c
index eb57bf4a..3e39b6fb 100644
--- a/imap.c
+++ b/imap.c
@@ -894,7 +894,11 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
     else
 	expunge_period = 1;
 
-    if (preauth)
+    /* 
+     * If either (a) we saw a PREAUTH token in the capability response, or
+     * (b) the user specified ssh preauthentication, then we're done.
+     */
+    if (preauth || ctl->server.preauthenticate == A_SSH)
 	return(PS_SUCCESS);
 
 #if OPIE_ENABLE