From: Steve Holme <steve_holme@hotmail.com>
Date: Sat, 2 Jun 2012 21:11:37 +0000 (+0100)
Subject: pop3: Fixed the issue of having to supply the user name for all requests
X-Git-Tag: curl-7_27_0~306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=69ba0da8272d;p=thirdparty%2Fcurl.git

pop3: Fixed the issue of having to supply the user name for all requests

Previously it wasn't possible to connect to POP3 and not specify the
user name as a CURLE_ACCESS_DENIED error would be returned. This error
occurred because USER would be sent to the server with a blank user name
if no mailbox user was specified as the server would reply with -ERR.

This wasn't a problem prior to the 7.26.0 release but with the
introduction of custom commands the user and/or application developer
might want to issue a CAPA command without having to log in as a
specific mailbox user.

Additionally this fix won't send the newly introduced AUTH command if no
user name is specified.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3352e8f8b3..115d6a3f18 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -14,6 +14,7 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o pop3: Fixed the issue of having to supply the user name for all requests
  o 
 
 This release includes the following known bugs:
diff --git a/lib/pop3.c b/lib/pop3.c
index 579e77bb5c..64efb255f1 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -305,12 +305,20 @@ static void state(struct connectdata *conn, pop3state newstate)
 
 static CURLcode pop3_state_auth(struct connectdata *conn)
 {
-  CURLcode result;
+  CURLcode result = CURLE_OK;
   struct pop3_conn *pop3c = &conn->proto.pop3c;
 
   pop3c->authmechs = 0;         /* No known authentication mechanisms yet */
   pop3c->authused = 0;          /* Clear the authentication mechanism used */
 
+  /* Check we have a username and password to authenticate with and end the
+     connect phase if we don't */
+  if(!conn->bits.user_passwd) {
+    state(conn, SMTP_STOP);
+
+    return result;
+  }
+
   /* send AUTH */
   result = Curl_pp_sendf(&pop3c->pp, "AUTH");