diff options
-rw-r--r-- | camel/ChangeLog | 10 | ||||
-rw-r--r-- | camel/providers/pop3/camel-pop3-engine.c | 4 | ||||
-rw-r--r-- | camel/providers/pop3/camel-pop3-store.c | 4 |
3 files changed, 14 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index 2fe82a6560..dc56cc9600 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,13 @@ +2002-02-09 Not Zed <NotZed@Ximian.com> + + * providers/pop3/camel-pop3-engine.c (get_capabilities): Duh, when + we grab the apop stamp it needs to include the <> as well, I even + read the rfc, silly me. + + * providers/pop3/camel-pop3-store.c (pop3_try_authenticate): Doh, + when iterating the authtype list, it helps to goto the next node. + Found with help from miles. + 2002-02-08 Not Zed <NotZed@Ximian.com> * providers/local/camel-spool-summary.c diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c index 22d3ab5930..682141f975 100644 --- a/camel/providers/pop3/camel-pop3-engine.c +++ b/camel/providers/pop3/camel-pop3-engine.c @@ -186,8 +186,8 @@ get_capabilities(CamelPOP3Engine *pe) if ((apop = strchr(line+3, '<')) && (apopend = strchr(apop, '>'))) { - *apopend = 0; - pe->apop = g_strdup(apop+1); + apopend[1] = 0; + pe->apop = g_strdup(apop); pe->capa = CAMEL_POP3_CAP_APOP; pe->auth = g_list_append(pe->auth, &camel_pop3_apop_authtype); } diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c index 520d758661..7f716ece68 100644 --- a/camel/providers/pop3/camel-pop3-store.c +++ b/camel/providers/pop3/camel-pop3-store.c @@ -307,9 +307,9 @@ pop3_try_authenticate (CamelService *service, const char *errmsg, l = store->engine->auth; while (l) { auth = l->data; - if (strcmp(auth->authproto, service->url->authmech) == 0) { + if (strcmp(auth->authproto, service->url->authmech) == 0) return try_sasl(store, service->url->authmech, ex) == -1; - } + l = l->next; } camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE, |