/*
- * 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 "password.h"
+#include "passwordstore.h"
typedef struct _IMAPFolder IMAPFolder;
typedef struct _IMAPSession IMAPSession;
typedef struct _IMAPNameSpace IMAPNameSpace;
typedef struct _IMAPFolderItem IMAPFolderItem;
-#include "prefs_account.h"
-
#define IMAP_FOLDER(obj) ((IMAPFolder *)obj)
#define IMAP_FOLDER_ITEM(obj) ((IMAPFolderItem *)obj)
#define IMAP_SESSION(obj) ((IMAPSession *)obj)
IMAPFlags flags,
GSList *tags,
int do_add);
-static gint imap_cmd_expunge (IMAPSession *session, gboolean force);
+static gint imap_cmd_expunge (IMAPSession *session);
static void imap_path_separator_subst (gchar *str,
gchar separator);
FolderItem *item,
MsgInfoList *msglist,
GHashTable *msgflags);
-static gchar *imap_folder_get_path (Folder *folder);
static gchar *imap_item_get_path (Folder *folder,
FolderItem *item);
static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
if (imap_class.idstr == NULL) {
imap_class.type = F_IMAP;
imap_class.idstr = "imap";
- imap_class.uistr = "IMAP4";
+ imap_class.uistr = "IMAP";
imap_class.supports_server_search = TRUE;
/* Folder functions */
imap_class.synchronise = imap_synchronise;
imap_class.remove_cached_msg = imap_remove_cached_msg;
imap_class.commit_tags = imap_commit_tags;
-#ifdef USE_PTREAD
- pthread_mutex_init(&imap_mutex, NULL);
-#endif
}
return &imap_class;
if (rfolder == NULL)
return;
- log_warning(LOG_PROTOCOL, _("IMAP4 connection broken\n"));
+ log_warning(LOG_PROTOCOL, _("IMAP connection broken\n"));
SESSION(session)->state = SESSION_DISCONNECTED;
SESSION(session)->sock = NULL;
}
case MAILIMAP_NO_ERROR:
return;
case MAILIMAP_NO_ERROR_AUTHENTICATED:
- log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" authenticated\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" not authenticated\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" bad state\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" stream error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" parse error "
- "(very probably non-RFC compliance from the server)\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" connection refused\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" memory error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" fatal error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" protocol error "
- "(very probably non-RFC compliance from the server)\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" connection not accepted\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" APPEND error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" NOOP error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" LOGOUT error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" CAPABILITY error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" CHECK error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" CLOSE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" EXPUNGE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" COPY error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" UID COPY error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" CREATE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" DELETE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" EXAMINE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" FETCH error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" UID FETCH error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" LIST error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" LOGIN error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" LSUB error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" RENAME error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" SEARCH error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" UID SEARCH error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" SELECT error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" STATUS error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" STORE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" UID STORE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" SUBSCRIBE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" UNSUBSCRIBE error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" STARTTLS error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" INVAL error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" EXTENSION error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" SASL error\n"), NULL), 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, g_strconcat(_("IMAP error on %s:"),_(" SSL error\n"), NULL), session_server);
+ log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"), " ", _("SSL/TLS error"), "\n", NULL), session_server);
break;
#endif
default:
- log_warning(LOG_PROTOCOL, g_strconcat(_("IMAP error on %s:"),_(" Unknown error [%d]\n"), NULL),
+ 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: "
session = NULL;
} else {
rfolder->session = NULL;
- log_warning(LOG_PROTOCOL, _("IMAP4 connection to %s has been"
+ log_warning(LOG_PROTOCOL, _("IMAP connection to %s has been"
" disconnected. Reconnecting...\n"),
folder->account->recv_server);
- statusbar_print_all(_("IMAP4 connection to %s has been"
+ statusbar_print_all(_("IMAP connection to %s has been"
" disconnected. Reconnecting...\n"),
folder->account->recv_server);
SESSION(session)->state = SESSION_DISCONNECTED;
if (account->ssl_imap != SSL_NONE) {
if (alertpanel_full(_("Insecure connection"),
_("This connection is configured to be secured "
- "using SSL, but SSL is not available in this "
- "build of Claws Mail. \n\n"
+ "using SSL/TLS, but SSL/TLS is not available "
+ "in this build of Claws Mail. \n\n"
"Do you want to continue connecting to this "
"server? The communication would not be "
"secure."),
#endif
imap_init(folder);
- buf = g_strdup_printf(_("Account '%s': Connecting to IMAP4 server: %s:%d..."),
+ buf = g_strdup_printf(_("Account '%s': Connecting to IMAP server: %s:%d..."),
folder->account->account_name, folder->account->recv_server,
port);
statuswindow_print_all("%s", buf);
else {
#ifdef USE_GNUTLS
if (r == MAILIMAP_ERROR_SSL)
- log_error(LOG_PROTOCOL, _("SSL handshake failed\n"));
+ log_error(LOG_PROTOCOL, _("SSL/TLS handshake failed\n"));
else
#endif
imap_handle_error(NULL, account->recv_server, r);
if(!prefs_common.no_recv_err_panel) {
- alertpanel_error_log(_("Can't connect to IMAP4 server: %s:%d"),
+ alertpanel_error_log(_("Can't connect to IMAP server: %s:%d"),
account->recv_server, port);
} else {
- log_error(LOG_PROTOCOL, _("Can't connect to IMAP4 server: %s:%d\n"),
+ log_error(LOG_PROTOCOL, _("Can't connect to IMAP server: %s:%d\n"),
account->recv_server, port);
}
ok = imap_cmd_starttls(session);
if (ok != MAILIMAP_NO_ERROR) {
- log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n"));
+ log_warning(LOG_PROTOCOL, _("Can't start STARTTLS session.\n"));
if (!is_fatal(ok)) {
SESSION(session)->sock = NULL;
imap_safe_destroy(session);
static gint imap_session_authenticate(IMAPSession *session,
PrefsAccount *account)
{
- gchar *pass, *acc_pass;
+ gchar *pass, *acc_pass = NULL;
gboolean failed = FALSE;
gint ok = MAILIMAP_NO_ERROR;
g_return_val_if_fail(account->userid != NULL, MAILIMAP_ERROR_BAD_STATE);
- if (password_get(account->userid, account->recv_server, "imap",
- SESSION(session)->port, &pass)) {
- Xstrdup_a(acc_pass, pass, {g_free(pass); return MAILIMAP_NO_ERROR;});
- g_free(pass);
- } else {
- acc_pass = password_decrypt(account->passwd, NULL);
+ if (!password_get(account->userid, account->recv_server, "imap",
+ SESSION(session)->port, &acc_pass)) {
+ acc_pass = passwd_store_get_account(account->account_id,
+ PWS_ACCOUNT_RECV);
}
+
try_again:
pass = acc_pass;
if (!pass && account->imap_auth_type != IMAP_AUTH_ANON && account->imap_auth_type != IMAP_AUTH_GSSAPI) {
account->userid,
&(account->session_passwd));
if (!tmp_pass) {
- memset(acc_pass, 0, strlen(acc_pass));
- g_free(acc_pass);
return MAILIMAP_NO_ERROR;
}
Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return MAILIMAP_NO_ERROR;});
if ((ok = imap_auth(session, account->userid, pass, account->imap_auth_type)) != MAILIMAP_NO_ERROR) {
if (!failed && !is_fatal(ok)) {
- memset(acc_pass, 0, strlen(acc_pass));
- g_free(acc_pass);
- 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);
alertpanel_error_log(_("Couldn't login to IMAP server %s."), account->recv_server);
}
- g_free(acc_pass);
- memset(acc_pass, 0, strlen(acc_pass));
+ if (acc_pass != NULL) {
+ memset(acc_pass, 0, strlen(acc_pass));
+ g_free(acc_pass);
+ acc_pass = NULL;
+ }
+
return ok;
}
- memset(acc_pass, 0, strlen(acc_pass));
- g_free(acc_pass);
+ if (acc_pass) {
+ memset(acc_pass, 0, strlen(acc_pass));
+ g_free(acc_pass);
+ }
statuswindow_pop_all();
session->authenticated = TRUE;
return MAILIMAP_NO_ERROR;
return ok;
}
} /* else we just need to expunge */
- ok = imap_cmd_expunge(session, folder->account->imap_use_trash);
+ ok = imap_cmd_expunge(session);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't expunge\n"));
g_free(destdir);
return new_item;
}
-static gchar *imap_folder_get_path(Folder *folder)
-{
- gchar *folder_path;
-
- g_return_val_if_fail(folder != NULL, NULL);
- g_return_val_if_fail(folder->account != NULL, NULL);
-
-#ifdef G_OS_WIN32
- gchar *sanitized_dirname = g_strdup(folder->account->recv_server);
- g_strdelimit(sanitized_dirname, ":", ',');
-#endif
-
- folder_path = g_strconcat(get_imap_cache_dir(),
- G_DIR_SEPARATOR_S,
-#ifdef G_OS_WIN32
- sanitized_dirname,
-#else
- folder->account->recv_server,
-#endif
- G_DIR_SEPARATOR_S,
- folder->account->userid,
- NULL);
-
-#ifdef G_OS_WIN32
- g_free(sanitized_dirname);
-#endif
- return folder_path;
-}
-
#ifdef G_OS_WIN32
static gchar *imap_encode_unsafe_chars(const gchar *str)
{
gchar *item_path = NULL;
g_return_val_if_fail(folder != NULL, NULL);
+ g_return_val_if_fail(folder->account != NULL, NULL);
g_return_val_if_fail(item != NULL, NULL);
- folder_path = imap_folder_get_path(folder);
+ folder_path = prefs_account_cache_dir(folder->account, FALSE);
g_return_val_if_fail(folder_path != NULL, NULL);
remove_all_numbered_files(dir);
g_free(dir);
- debug_print("done.\n");
+ debug_print("Deleting all cached messages done.\n");
}
gchar imap_get_path_separator_for_item(FolderItem *item)
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
- log_warning(LOG_PROTOCOL, _("Server requires TLS to log in.\n"));
+ log_warning(LOG_PROTOCOL, _("Server requires STARTTLS to log in.\n"));
ok = imap_cmd_starttls(session);
if (ok != MAILIMAP_NO_ERROR) {
- log_warning(LOG_PROTOCOL, _("Can't start TLS session.\n"));
+ log_warning(LOG_PROTOCOL, _("Can't start STARTTLS session.\n"));
return ok;
} else {
/* refresh capas */
}
#else
log_error(LOG_PROTOCOL, _("Connection to %s failed: "
- "server requires TLS, but Claws Mail "
- "has been compiled without TLS "
+ "server requires STARTTLS, but Claws Mail "
+ "has been compiled without STARTTLS "
"support.\n"),
SESSION(session)->server);
return MAILIMAP_ERROR_LOGIN;
}
}
- log_print(LOG_PROTOCOL, "IMAP4> Logging %s to %s using %s\n",
+ log_print(LOG_PROTOCOL, "IMAP> Logging %s to %s using %s\n",
user,
SESSION(session)->server,
type);
r = imap_threaded_login(session->folder, user, pass, type);
if (r != MAILIMAP_NO_ERROR) {
imap_handle_error(SESSION(session), NULL, r);
- log_print(LOG_PROTOCOL, "IMAP4< Error logging in to %s\n",
+ log_print(LOG_PROTOCOL, "IMAP< Error logging in to %s\n",
SESSION(session)->server);
ok = r;
} else {
- log_print(LOG_PROTOCOL, "IMAP4< Login to %s successful\n",
+ log_print(LOG_PROTOCOL, "IMAP< Login to %s successful\n",
SESSION(session)->server);
ok = MAILIMAP_NO_ERROR;
}
SESSION(session)->server, SESSION(session)->port);
if (r != MAILIMAP_NO_ERROR) {
imap_handle_error(SESSION(session), NULL, r);
- debug_print("starttls err %d\n", r);
+ debug_print("STARTTLS err %d\n", r);
return r;
}
return MAILIMAP_NO_ERROR;
return MAILIMAP_NO_ERROR;
}
-static gint imap_cmd_expunge(IMAPSession *session, gboolean do_expunge)
+static gint imap_cmd_expunge(IMAPSession *session)
{
int r;
- if (!do_expunge)
- return MAILIMAP_NO_ERROR;
-
if (prefs_common.work_offline &&
!inc_offline_should_override(FALSE,
_("Claws Mail needs network access in order "
if (session == NULL)
return -1;
- return imap_cmd_expunge(session, TRUE);
+ return imap_cmd_expunge(session);
}
static void imap_path_separator_subst(gchar *str, gchar separator)
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,
- '/',
FOLDER_ITEM(item)->path);
else
statusbar_print_all(_("Scanning folder %s..."),
return ok;
}
- ok = imap_cmd_expunge(session, folder->account->imap_use_trash);
+ ok = imap_cmd_expunge(session);
if (ok != MAILIMAP_NO_ERROR) {
log_warning(LOG_PROTOCOL, _("can't expunge\n"));
_("You have one or more IMAP accounts "
"defined. However this version of "
"Claws Mail has been built without "
- "IMAP support; your IMAP account(s) are "
+ "IMAP support; your IMAP accounts are "
"disabled.\n\n"
"You probably need to "
"install libetpan and recompile "
if (imap_class.idstr == NULL) {
imap_class.type = F_IMAP;
imap_class.idstr = "imap";
- imap_class.uistr = "IMAP4";
+ imap_class.uistr = "IMAP";
imap_class.new_folder = imap_folder_new;
imap_class.create_tree = imap_create_tree;
projects / claws.git / blobdiff