/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail team
+ * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "prefs_account.h"
#include "codeconv.h"
#include "md5.h"
-#include "base64.h"
#include "utils.h"
#include "prefs_common.h"
#include "inputdialog.h"
{
struct mailimap_capability_data *capabilities = NULL;
clistiter *cur;
- int result = -1;
+ int result;
if (session->capability != NULL)
return MAILIMAP_NO_ERROR;
- capabilities = imap_threaded_capability(session->folder, &result);
+ result = imap_threaded_capability(session->folder, &capabilities);
if (result != MAILIMAP_NO_ERROR) {
return result;
case IMAP_AUTH_DIGEST_MD5:
ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
break;
+ case IMAP_AUTH_SCRAM_SHA1:
+ ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
+ break;
case IMAP_AUTH_LOGIN:
ok = imap_cmd_login(session, user, pass, "LOGIN");
break;
"\t ANONYMOUS %d\n"
"\t CRAM-MD5 %d\n"
"\t DIGEST-MD5 %d\n"
+ "\t SCRAM-SHA-1 %d\n"
"\t LOGIN %d\n"
"\t GSSAPI %d\n",
imap_has_capability(session, "ANONYMOUS"),
imap_has_capability(session, "CRAM-MD5"),
imap_has_capability(session, "DIGEST-MD5"),
+ imap_has_capability(session, "SCRAM-SHA-1"),
imap_has_capability(session, "LOGIN"),
imap_has_capability(session, "GSSAPI"));
if (imap_has_capability(session, "CRAM-MD5"))
ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "DIGEST-MD5"))
ok = imap_cmd_login(session, user, pass, "DIGEST-MD5");
+ if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "SCRAM-SHA-1"))
+ ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "GSSAPI"))
ok = imap_cmd_login(session, user, pass, "GSSAPI");
if (ok == MAILIMAP_ERROR_LOGIN) /* we always try LOGIN before giving up */
"DIGEST-MD5 SASL plugin is installed.");
}
+ if (type == IMAP_AUTH_SCRAM_SHA1) {
+ ext_info = _("\n\nSCRAM-SHA-1 logins only work if libetpan has been "
+ "compiled with SASL support and the "
+ "SCRAM SASL plugin is installed.");
+ }
+
if (time(NULL) - last_login_err > 10) {
if (!prefs_common.no_recv_err_panel) {
alertpanel_error_log(_("Connection to %s failed: "
case MATCHCRITERIA_NOT_HEADER: invert = TRUE; matchertype = MATCHCRITERIA_HEADER; break;
case MATCHCRITERIA_NOT_TAG: invert = TRUE; matchertype = MATCHCRITERIA_TAG; break;
case MATCHCRITERIA_NOT_HEADERS_PART: invert = TRUE; matchertype = MATCHCRITERIA_HEADERS_PART; break;
+ case MATCHCRITERIA_NOT_HEADERS_CONT: invert = TRUE; matchertype = MATCHCRITERIA_HEADERS_CONT; break;
case MATCHCRITERIA_NOT_MESSAGE: invert = TRUE; matchertype = MATCHCRITERIA_MESSAGE; break;
case MATCHCRITERIA_NOT_BODY_PART: invert = TRUE; matchertype = MATCHCRITERIA_BODY_PART; break;
case MATCHCRITERIA_NOT_TO_AND_NOT_CC: invert = TRUE; matchertype = MATCHCRITERIA_TO_OR_CC; break;
break;
case MATCHCRITERIA_HEADERS_PART:
+ case MATCHCRITERIA_HEADERS_CONT:
result = imap_search_and(
imap_search_not(imap_search_new(IMAP_SEARCH_CRITERIA_BODY, NULL, match->expr, 0)),
imap_search_new(IMAP_SEARCH_CRITERIA_MESSAGE, NULL, match->expr, 0)
}
}
if (!new_item) {
- if (old_item && old_item->path && !strcmp(old_item->path, "INBOX")) {
+ if (old_item && old_item->path && !strcasecmp(old_item->path, "INBOX")) {
debug_print("not removing INBOX\n");
} else {
debug_print("folder '%s' not found. removing...\n",
folder_item_append(item, new_item);
}
- if (!strcmp(new_item->path, "INBOX")) {
+ if (!strcasecmp(new_item->path, "INBOX")) {
new_item->stype = F_INBOX;
folder->inbox = new_item;
} else if (!folder_item_parent(item) || item->stype == F_INBOX) {
if (!folder->outbox && !g_ascii_strcasecmp(base, "Sent")) {
new_item->stype = F_OUTBOX;
folder->outbox = new_item;
- } else if (!folder->draft && !g_ascii_strcasecmp(base, "Drafts")) {
+ } else if (!folder->draft && (!g_ascii_strcasecmp(base, "Drafts") || !g_ascii_strcasecmp(base, "Draft"))) {
new_item->stype = F_DRAFT;
folder->draft = new_item;
} else if (!folder->queue && !g_ascii_strcasecmp(base, "Queue")) {
return NULL;
}
- if (!folder_item_parent(parent) && strcmp(name, "INBOX") == 0) {
+ if (!folder_item_parent(parent) && strcasecmp(name, "INBOX") == 0) {
dirpath = g_strdup(name);
}else if (parent->path)
dirpath = g_strconcat(parent->path, "/", name, NULL);
/* remove trailing / for display */
strtailchomp(new_name, '/');
- if (strcmp(dirpath, "INBOX") != 0) {
+ if (strcasecmp(dirpath, "INBOX") != 0) {
GPtrArray *argbuf;
int r;
clist * lep_list;
g_free(path);
return -1;
}
- if (!strcmp(path, "INBOX") && sub == FALSE) {
+ if (!strcasecmp(path, "INBOX") && sub == FALSE) {
g_free(path);
return -1;
}
#else
log_error(LOG_PROTOCOL, _("Connection to %s failed: "
"server requires TLS, but Claws Mail "
- "has been compiled without OpenSSL "
+ "has been compiled without TLS "
"support.\n"),
SESSION(session)->server);
return MAILIMAP_ERROR_LOGIN;
return FALSE;
}
- debug_print("exists %d, item->item.total_msgs %d\n",
- exists, item->item.total_msgs);
+ debug_print("exists %d, item->item.total_msgs %d\n"
+ "\tunseen %d, item->item.unread_msgs %d\n"
+ "\tuid_next %d, item->uid_next %d\n"
+ "\tuid_val %d, item->item.mtime %d\n",
+ exists, item->item.total_msgs,unseen, item->item.unread_msgs,
+ uid_next, item->uid_next,uid_val, item->item.mtime);
if (exists != item->item.total_msgs
|| unseen != item->item.unread_msgs
|| uid_next != item->uid_next
new_item = folder_item_new(FOLDER(folder), loc_name, loc_path);
if ((flags & ETPAN_IMAP_MB_NOINFERIORS) != 0)
new_item->no_sub = TRUE;
- if (strcmp(dup_name, "INBOX") != 0 &&
+ if (strcasecmp(dup_name, "INBOX") != 0 &&
((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
new_item->no_select = TRUE;