Fixed an undead-message hole.

svn path=/trunk/; revision=2220

3 files changed, 7 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 1e3410b8..0678c806 100644
--- a/NEWS
+++ b/NEWS
@@ -6,9 +6,11 @@ fetchmail-4.6.8 ():
   supported language is Brazilo-Portuegese (LC_ALL=pt_BR).
 * Fixed Debian Bug#29913: -M on the command line causes SEGV in daemon mode.
 * Emit an informational message when fetchlimit is reached.
-* Added bounce-mail capability on common error types.
+* Added bounce-mail capability on SMTP/ESMTP error messages.
+* Documented fetchmail's actions on ESMTP errors.
+* Fix an undead-message hole in POP3 with fetchall on.
 
-There are 246 people on fetchmail-friends and 309 on fetchmail-announce.
+There are 247 people on fetchmail-friends and 309 on fetchmail-announce.
 
 fetchmail-4.6.7 (Sat Nov 21 13:59:47 EST 1998):
 * Gerald Britton's patches to enable Hesiod support.
diff --git a/driver.c b/driver.c
index cc167c75..0e63c19d 100644
--- a/driver.c
+++ b/driver.c
@@ -1662,7 +1662,8 @@ const struct method *proto;	/* protocol method table */
 		     * other hand, you can (peek_capable is set by 
 		     * each driver module to convey this; it's not a
 		     * method constant because of the difference between
-		     * IMAP2bis and IMAP4).
+		     * IMAP2bis and IMAP4, and because POP3 doesn't  peek
+		     * if fetchall is on).
 		     *
 		     * The result of being unable to peek is that if there's
 		     * any kind of transient error (DNS lookup failure, or
diff --git a/pop3.c b/pop3.c
index 150dd3a2..da21777c 100644
--- a/pop3.c
+++ b/pop3.c
@@ -667,7 +667,7 @@ int doPOP3 (struct query *ctl)
 	return(PS_SYNTAX);
     }
 #endif /* MBOX */
-    peek_capable = FALSE;
+    peek_capable = !ctl->fetchall;
     return(do_protocol(ctl, &pop3));
 }
 #endif /* POP3_ENABLE */