From: Colin Leroy Date: Sat, 16 Dec 2006 16:38:14 +0000 (+0000) Subject: 2006-12-16 [colin] 2.6.1cvs43 X-Git-Tag: rel_2_7_0~79 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=eca59e3ebb9defacaf8a0751568236367c33374a 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' --- diff --git a/ChangeLog b/ChangeLog index f013ea8f9..6d4c26951 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +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 diff --git a/PATCHSETS b/PATCHSETS index a9bb92cf1..ba7e151d7 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2150,3 +2150,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index ab239e74e..2e1562b63 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=6 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=42 +EXTRA_VERSION=43 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/po/POTFILES.in b/po/POTFILES.in index ea326da32..36d2dc2e9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -9,6 +9,7 @@ src/browseldap.c 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 diff --git a/src/common/nntp.c b/src/common/nntp.c index 82c8b8f8a..a949c4272 100644 --- a/src/common/nntp.c +++ b/src/common/nntp.c @@ -77,6 +77,7 @@ Session *nntp_session_new(const gchar *server, gushort port, gchar *buf, #if USE_OPENSSL if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) { + log_error(_("SSL handshake failed\n")); sock_close(sock); return NULL; } diff --git a/src/common/session.c b/src/common/session.c index 444b50b4a..7d2503931 100644 --- a/src/common/session.c +++ b/src/common/session.c @@ -24,6 +24,7 @@ #include "defs.h" #include +#include #include #include @@ -161,6 +162,7 @@ static gint session_connect_cb(SockInfo *sock, gpointer data) 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; } diff --git a/src/imap.c b/src/imap.c index 39f497ae6..edf2df37c 100644 --- a/src/imap.c +++ b/src/imap.c @@ -825,8 +825,14 @@ static IMAPSession *imap_session_new(Folder * folder, 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"),