From: Colin Leroy Date: Wed, 6 Dec 2006 07:21:51 +0000 (+0000) Subject: 2006-12-06 [colin] 2.6.1cvs7 X-Git-Tag: rel_2_7_0~116 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=ce55e98a7d75cdbc560cc8e4680f4b69d09c9281;hp=8f5b92b45a9d48625b8c0b8fc0df8d53b0951761 2006-12-06 [colin] 2.6.1cvs7 * src/etpan/imap-thread.c Fix certificate checking on IMAP --- diff --git a/ChangeLog b/ChangeLog index 23c8e6782..39d1b508b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-06 [colin] 2.6.1cvs7 + + * src/etpan/imap-thread.c + Fix certificate checking on IMAP + 2006-12-06 [colin] 2.6.1cvs6 * src/folderview.c diff --git a/PATCHSETS b/PATCHSETS index c80f04612..a4dcdfd41 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2114,3 +2114,4 @@ ( cvs diff -u -r 1.1.2.39 -r 1.1.2.40 src/wizard.c; ) > 2.6.1cvs4.patchset ( cvs diff -u -r 1.3.12.20 -r 1.3.12.21 src/message_search.c; cvs diff -u -r 1.15.2.38 -r 1.15.2.39 src/summary_search.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/combobox.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/combobox.h; cvs diff -u -r 1.5.2.45 -r 1.5.2.46 src/gtk/gtkutils.c; cvs diff -u -r 1.4.2.27 -r 1.4.2.28 src/gtk/gtkutils.h; ) > 2.6.1cvs5.patchset ( cvs diff -u -r 1.207.2.136 -r 1.207.2.137 src/folderview.c; ) > 2.6.1cvs6.patchset +( cvs diff -u -r 1.1.4.58 -r 1.1.4.59 src/etpan/imap-thread.c; ) > 2.6.1cvs7.patchset diff --git a/configure.ac b/configure.ac index 00cbd3001..96799c425 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=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c index a1ca413de..913c00f51 100644 --- a/src/etpan/imap-thread.c +++ b/src/etpan/imap-thread.c @@ -489,7 +489,8 @@ int imap_threaded_connect_ssl(Folder * folder, const char * server, int port) refresh_resolvers(); threaded_run(folder, ¶m, &result, connect_ssl_run); - if (result.error == 0 && !etpan_skip_ssl_cert_check) { + if ((result.error == MAILIMAP_NO_ERROR_AUTHENTICATED || + result.error == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) && !etpan_skip_ssl_cert_check) { cert_len = mailstream_ssl_get_certificate(imap->imap_stream, &certificate); if (etpan_certificate_check(certificate, cert_len, ¶m) < 0) return -1;