/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2014 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 1999-2016 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
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
#ifdef HAVE_CONFIG_H
#include "account.h"
#include "tags.h"
#include "main.h"
+#include "passwordstore.h"
typedef struct _IMAPFolder IMAPFolder;
typedef struct _IMAPSession IMAPSession;
case MAILIMAP_NO_ERROR:
return;
case MAILIMAP_NO_ERROR_AUTHENTICATED:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: authenticated\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("authenticated"), "\n", NULL), session_server);
break;
case MAILIMAP_NO_ERROR_NON_AUTHENTICATED:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: not authenticated\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("not authenticated"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_BAD_STATE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: bad state\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("bad state"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_STREAM:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: stream error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("stream error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_PARSE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: parse error "
- "(very probably non-RFC compliance from the server)\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("parse error "
+ "(very probably non-RFC compliance from the server)"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_CONNECTION_REFUSED:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: connection refused\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("connection refused"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_MEMORY:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: memory error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("memory error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_FATAL:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: fatal error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("fatal error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_PROTOCOL:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: protocol error"
- "(very probably non-RFC compliance from the server)\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("protocol error "
+ "(very probably non-RFC compliance from the server)"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_DONT_ACCEPT_CONNECTION:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: connection not accepted\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("connection not accepted"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_APPEND:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: APPEND error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("APPEND error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_NOOP:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: NOOP error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("NOOP error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_LOGOUT:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: LOGOUT error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("LOGOUT error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_CAPABILITY:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: CAPABILITY error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("CAPABILITY error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_CHECK:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: CHECK error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("CHECK error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_CLOSE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: CLOSE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("CLOSE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_EXPUNGE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXPUNGE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("EXPUNGE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_COPY:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: COPY error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("COPY error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_UID_COPY:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID COPY error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("UID COPY error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_CREATE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: CREATE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("CREATE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_DELETE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: DELETE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("DELETE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_EXAMINE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXAMINE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("EXAMINE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_FETCH:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: FETCH error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("FETCH error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_UID_FETCH:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID FETCH error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("UID FETCH error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_LIST:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: LIST error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("LIST error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_LOGIN:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: LOGIN error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("LOGIN error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_LSUB:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: LSUB error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("LSUB error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_RENAME:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: RENAME error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("RENAME error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_SEARCH:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: SEARCH error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SEARCH error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_UID_SEARCH:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID SEARCH error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("UID SEARCH error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_SELECT:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: SELECT error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SELECT error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_STATUS:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: STATUS error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("STATUS error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_STORE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: STORE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("STORE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_UID_STORE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: UID STORE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("UID STORE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_SUBSCRIBE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: SUBSCRIBE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SUBSCRIBE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_UNSUBSCRIBE:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: UNSUBSCRIBE error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("UNSUBSCRIBE error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_STARTTLS:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: STARTTLS error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("STARTTLS error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_INVAL:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: INVAL error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("INVAL error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_EXTENSION:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: EXTENSION error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("EXTENSION error"), "\n", NULL), session_server);
break;
case MAILIMAP_ERROR_SASL:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: SASL error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SASL error"), "\n", NULL), session_server);
break;
#ifdef USE_GNUTLS
case MAILIMAP_ERROR_SSL:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: SSL error\n"), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SSL error"), "\n", NULL), session_server);
break;
#endif
default:
- log_warning(LOG_PROTOCOL, _("IMAP error on %s: Unknown error [%d]\n"),
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("Unknown error [%d]"), "\n", NULL),
session_server, libetpan_errcode);
break;
}
case IMAP_AUTH_SCRAM_SHA1:
ok = imap_cmd_login(session, user, pass, "SCRAM-SHA-1");
break;
+ case IMAP_AUTH_PLAIN:
+ ok = imap_cmd_login(session, user, pass, "PLAIN");
+ break;
case IMAP_AUTH_LOGIN:
ok = imap_cmd_login(session, user, pass, "LOGIN");
break;
+ case IMAP_AUTH_PLAINTEXT:
+ ok = imap_cmd_login(session, user, pass, "plaintext");
+ break;
case IMAP_AUTH_GSSAPI:
ok = imap_cmd_login(session, user, pass, "GSSAPI");
break;
"\t CRAM-MD5 %d\n"
"\t DIGEST-MD5 %d\n"
"\t SCRAM-SHA-1 %d\n"
+ "\t PLAIN %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, "PLAIN"),
imap_has_capability(session, "LOGIN"),
imap_has_capability(session, "GSSAPI"));
if (imap_has_capability(session, "CRAM-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, "PLAIN"))
+ ok = imap_cmd_login(session, user, pass, "PLAIN");
+ if (ok == MAILIMAP_ERROR_LOGIN && imap_has_capability(session, "LOGIN"))
+ ok = imap_cmd_login(session, user, pass, "LOGIN");
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 */
- ok = imap_cmd_login(session, user, pass, "LOGIN");
+ if (ok == MAILIMAP_ERROR_LOGIN) /* we always try plaintext login before giving up */
+ ok = imap_cmd_login(session, user, pass, "plaintext");
}
if (ok == MAILIMAP_NO_ERROR)
"SCRAM SASL plugin is installed.");
}
+ if (type == IMAP_AUTH_PLAIN) {
+ ext_info = _("\n\nPLAIN logins only work if libetpan has been "
+ "compiled with SASL support and the "
+ "PLAIN SASL plugin is installed.");
+ }
+
+ if (type == IMAP_AUTH_LOGIN) {
+ ext_info = _("\n\nLOGIN logins only work if libetpan has been "
+ "compiled with SASL support and the "
+ "LOGIN 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: "
Xstrdup_a(acc_pass, pass, {g_free(pass); return MAILIMAP_NO_ERROR;});
g_free(pass);
} else {
- acc_pass = account->passwd;
+ acc_pass = passwd_store_get_account(account->account_id,
+ PWS_ACCOUNT_RECV);
}
try_again:
pass = acc_pass;
tmp_pass = input_dialog_query_password_keep(account->recv_server,
account->userid,
&(account->session_passwd));
- if (!tmp_pass)
+ if (!tmp_pass) {
return MAILIMAP_NO_ERROR;
+ }
Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return MAILIMAP_NO_ERROR;});
g_free(tmp_pass);
} else if (account->imap_auth_type == IMAP_AUTH_ANON || account->imap_auth_type == IMAP_AUTH_GSSAPI) {
if ((ok = imap_auth(session, account->userid, pass, account->imap_auth_type)) != MAILIMAP_NO_ERROR) {
if (!failed && !is_fatal(ok)) {
- acc_pass = NULL;
+ if (acc_pass != NULL) {
+ memset(acc_pass, 0, strlen(acc_pass));
+ g_free(acc_pass);
+ acc_pass = NULL;
+ }
failed = TRUE;
if (account->session_passwd != NULL) {
g_free(account->session_passwd);
mainwindow_show_error();
} else
alertpanel_error_log(_("Couldn't login to IMAP server %s."), account->recv_server);
- }
+ }
+
+ if (acc_pass != NULL) {
+ g_free(acc_pass);
+ memset(acc_pass, 0, strlen(acc_pass));
+ }
return ok;
}
+ if (acc_pass) {
+ memset(acc_pass, 0, strlen(acc_pass));
+ g_free(acc_pass);
+ }
statuswindow_pop_all();
session->authenticated = TRUE;
return MAILIMAP_NO_ERROR;
have_size, cached->size);
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
}
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
return filename;
} else if (!cached && time(NULL) - get_file_mtime(filename) < 60) {
debug_print("message not cached and file recent, considering file complete\n");
if (ok == 0)
return filename;
} else {
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
}
}
if (cached && MSG_IS_FULLY_CACHED(cached->flags)) {
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
return filename;
}
} else {
MsgInfo *cached = msgcache_get_msg(item->cache,uid);
if (cached) {
procmsg_msginfo_unset_flags(cached, MSG_FULLY_CACHED, 0);
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
}
}
MsgInfo *cached = msgcache_get_msg(item->cache,uid);
if (cached) {
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
}
} else if (ok == -1) {
MsgInfo *cached = msgcache_get_msg(item->cache,uid);
if (cached) {
procmsg_msginfo_unset_flags(cached, MSG_FULLY_CACHED, 0);
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
}
}
return filename;
return FALSE;
if (MSG_IS_FULLY_CACHED(cached->flags)) {
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
return TRUE;
}
if (cached && size >= cached->size) {
cached->total_size = cached->size;
procmsg_msginfo_set_flags(cached, MSG_FULLY_CACHED, 0);
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
return TRUE;
}
if (cached)
- procmsg_msginfo_free(cached);
+ procmsg_msginfo_free(&cached);
return FALSE;
}
return NULL;
ret = g_malloc(3*strlen(str)+1);
o_ret = ret;
- for (i = str; *i; i++) {
+ for (i = (gchar *)str; *i; i++) {
switch(*i) {
case ':':
case '|':
g_free(real_oldpath);
return -1;
}
- if (strchr(item->path, G_DIR_SEPARATOR)) {
+ if (strchr(item->path, '/')) {
dirpath = g_path_get_dirname(item->path);
- newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
+ newpath = g_strconcat(dirpath, "/", name, NULL);
g_free(dirpath);
} else
newpath = g_strdup(name);
imap_folder = IMAP_FOLDER(folder);
- debug_print("getting session...");
+ debug_print("getting session...\n");
session = imap_session_get(FOLDER(folder));
result = imap_get_path_separator(session, imap_folder, item->path, &ok);
return result;
int r;
gint ok;
- if (!strcmp(type, "LOGIN") && imap_has_capability(session, "LOGINDISABLED")) {
+ if (!strcmp(type, "plaintext") && imap_has_capability(session, "LOGINDISABLED")) {
gint ok = MAILIMAP_ERROR_BAD_STATE;
if (imap_has_capability(session, "STARTTLS")) {
#ifdef USE_GNUTLS
}
base = item->path + oldpathlen;
- while (*base == G_DIR_SEPARATOR) base++;
+ while (*base == '/') base++;
if (*base == '\0')
new_itempath = g_strdup(newpath);
else
- new_itempath = g_strconcat(newpath, G_DIR_SEPARATOR_S, base,
+ new_itempath = g_strconcat(newpath, "/", base,
NULL);
real_oldpath = imap_get_real_path(session, IMAP_FOLDER(item->folder), item->path, &ok);
lock_session(session);
if (FOLDER_ITEM(item)->path)
- statusbar_print_all(_("Scanning folder %s%c%s..."),
+ statusbar_print_all(_("Scanning folder %s/%s..."),
FOLDER_ITEM(item)->folder->name,
- G_DIR_SEPARATOR,
FOLDER_ITEM(item)->path);
else
statusbar_print_all(_("Scanning folder %s..."),
data->full_search = TRUE;
for (cur = tmp; cur; cur = cur->next)
- procmsg_msginfo_free((MsgInfo *)cur->data);
+ procmsg_msginfo_free((MsgInfo **)&(cur->data));
g_slist_free(tmp);
projects / claws.git / blobdiff