2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index ae814ec2..77d82b22 100644
--- a/NEWS
+++ b/NEWS
@@ -105,6 +105,7 @@ fetchmail 6.3.0 (not yet released officially):
 * Dropped da=Danish, el=Greek, ja=Japanese, sq=Albanian and tr=Turkish
   translations which have more than 10% (61+) untranslated or fuzzy
   messages. Matthias Andree.
+* Skip sending POP3 PASS command when USER command failed. Matthias Andree.
 
 fetchmail-6.2.5 (Wed Oct 15 18:39:22 EDT 2003), 23079 lines:
 
diff --git a/pop3.c b/pop3.c
index 5cd9685d..959eb76a 100644
--- a/pop3.c
+++ b/pop3.c
@@ -491,7 +491,8 @@ static int pop3_getauth(int sock, struct query *ctl, char *greeting)
 	}
 
 	/* ordinary validation, no one-time password or RPA */ 
-	gen_transact(sock, "USER %s", ctl->remotename);
+	if ((ok = gen_transact(sock, "USER %s", ctl->remotename)))
+	    break;
 
 #ifdef OPIE_ENABLE
 	/* see RFC1938: A One-Time Password System */