+2006-12-16 [colin] 2.6.1cvs43
+
+ * po/POTFILES.in
+ * src/imap.c
+ * src/common/nntp.c
+ * src/common/session.c
+ Log error when SSL handshakes fail.
+ Fixes bug 1082, 'incorrect / imprecise
+ error message when imap server provides
+ ssl only through STARTTLS but SSL is
+ selected'
+
2006-12-15 [wwp] 2.6.1cvs42
* src/plugins/bogofilter/bogofilter_gtk.c
( cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/wizard.c; cvs diff -u -r 1.13.2.22 -r 1.13.2.23 src/common/plugin.c; cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/common/plugin.h; cvs diff -u -r 1.4.2.43 -r 1.4.2.44 src/gtk/about.c; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.13.2.27 -r 1.13.2.28 src/plugins/clamav/clamav_plugin.c; cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/plugins/demo/demo.c; cvs diff -u -r 1.12.2.17 -r 1.12.2.18 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/plugin.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/pgpinline/plugin.c; cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.18.2.44 -r 1.18.2.45 src/plugins/spamassassin/spamassassin.c; cvs diff -u -r 1.14.2.45 -r 1.14.2.46 src/plugins/trayicon/trayicon.c; ) > 2.6.1cvs40.patchset
( cvs diff -u -r 1.1.2.19 -r 1.1.2.20 src/plugins/bogofilter/bogofilter.c; cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/bogofilter/bogofilter.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/bogofilter/bogofilter_gtk.c; ) > 2.6.1cvs41.patchset
( cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/bogofilter/bogofilter_gtk.c; ) > 2.6.1cvs42.patchset
+( cvs diff -u -r 1.53.2.20 -r 1.53.2.21 po/POTFILES.in; cvs diff -u -r 1.179.2.139 -r 1.179.2.140 src/imap.c; cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/common/nntp.c; cvs diff -u -r 1.23.2.10 -r 1.23.2.11 src/common/session.c; ) > 2.6.1cvs43.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
src/common/md5.c
src/common/nntp.c
src/common/plugin.c
+src/common/session.c
src/common/smtp.c
src/common/socket.c
src/common/ssl.c
#if USE_OPENSSL
if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
+ log_error(_("SSL handshake failed\n"));
sock_close(sock);
return NULL;
}
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <stdio.h>
#include <stdlib.h>
sock_set_nonblocking_mode(sock, FALSE);
if (!ssl_init_socket(sock)) {
g_warning("can't initialize SSL.");
+ log_error(_("SSL handshake failed\n"));
session->state = SESSION_ERROR;
return -1;
}
authenticated = FALSE;
}
else {
+#if (LIBETPAN_VERSION_MAJOR > 0 || LIBETPAN_VERSION_MINOR > 48)
+#ifdef USE_OPENSSL
+ if (r == MAILIMAP_ERROR_SSL)
+ log_error(_("SSL handshake failed\n"));
+#endif
+#endif
if(!prefs_common.no_recv_err_panel) {
- alertpanel_error(_("Can't connect to IMAP4 server: %s:%d"),
+ alertpanel_error_log(_("Can't connect to IMAP4 server: %s:%d"),
account->recv_server, port);
} else {
log_error(_("Can't connect to IMAP4 server: %s:%d\n"),