aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2012-06-02 22:11:37 +0100
committerSteve Holme <steve_holme@hotmail.com>2012-06-02 22:11:37 +0100
commit69ba0da8272d7bddeef518670d4c1298b0627ad7 (patch)
treeb1bd8255b0ad173428affdb95ef38303ed60e116
parent1fa2af5136e1167bfc18a128d16a89865ca5065a (diff)
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.
-rw-r--r--RELEASE-NOTES1
-rw-r--r--lib/pop3.c10
2 files changed, 10 insertions, 1 deletions
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3352e8f8b..115d6a3f1 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 579e77bb5..64efb255f 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");