Fix wrong-password coredump.

svn path=/trunk/; revision=1693

diff --git a/NEWS b/NEWS
index 46d8fd6a9bc0cb01b6e58948fdfbe4234fad7410..affd36e74a9425f143102ebe9bd7c6445030d09b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,11 @@
                                Release Notes:
 
 ------------------------------------------------------------------------------
+fetchmail-4.4.0 ():
+* Fix bug that prevented graceful exit from POP3 validation on wrong password.
+
+There are 275 people on fetchmail-friends and 153 on fetchmail-announce.
+
 fetchmail-4.3.9 (Fri Mar  6 10:45:32 EST 1998):
 * Relax the LOGIN capability check in IMAP.
 * John Stracke <francis@netscape.com> sent a workaround for SIGALRM flakiness

diff --git a/pop3.c b/pop3.c
index 5873b488e301be670fa650245cee81b2801c48d1..11ef1105a2642d2fb28970e616e0b23d276e5b29 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -216,14 +216,13 @@ int pop3_getauth(int sock, struct query *ctl, char *greeting)
        ok = PS_ERROR;
     }
 
-    /* maybe we detected a lock-busy condition? */
     if (ok != 0)
     {
+       /* maybe we detected a lock-busy condition? */
         if (ok == PS_LOCKBUSY)
-       {
            error(0, 0, "lock busy!  Is another session active?"); 
-           return(PS_LOCKBUSY);
-       }
+
+       return(ok);
     }
 
     /*