Fix Chris Evert's bug.

svn path=/trunk/; revision=2510

2 files changed, 10 insertions, 9 deletions

diff --git a/NEWS b/NEWS
index 640c91fd..120bbf37 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ fetchmail-5.0.5 ():
 * Make the .fetchmail_pid lockfile with O_EXCL.  Duhh...
 * New FAQ item RH on startup failures under Red Hat 6.0.
 * IMAP now skips the authorization step on a PREAUTH response.
+* Fix bug in defaulting of IMAP expunge period with non-LOGIN auth modes.
 
 There are 258 people on fetchmail-friends and 412 on fetchmail-announce.
 
diff --git a/imap.c b/imap.c
index 491c1b41..39aa3695 100644
--- a/imap.c
+++ b/imap.c
@@ -774,6 +774,15 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
 
     peek_capable = (imap_version >= IMAP4);
 
+    /* 
+     * Assumption: expunges are cheap, so we want to do them
+     * after every message unless user said otherwise.
+     */
+    if (NUM_SPECIFIED(ctl->expunge))
+	expunge_period = NUM_VALUE_OUT(ctl->expunge);
+    else
+	expunge_period = 1;
+
     if (preauth)
 	return(PS_SUCCESS);
 
@@ -859,15 +868,6 @@ int imap_getauth(int sock, struct query *ctl, char *greeting)
     if (ok)
 	return(ok);
     
-    /* 
-     * Assumption: expunges are cheap, so we want to do them
-     * after every message unless user said otherwise.
-     */
-    if (NUM_SPECIFIED(ctl->expunge))
-	expunge_period = NUM_VALUE_OUT(ctl->expunge);
-    else
-	expunge_period = 1;
-
     return(PS_SUCCESS);
 }