2006-12-06 [colin] 2.6.1cvs7

	* src/etpan/imap-thread.c
		Fix certificate checking on IMAP

diff --git a/ChangeLog b/ChangeLog
index 23c8e67826c17ae569ef4ac71a54f58289370e47..39d1b508be3d17809072c4741da8582bb1511fbc 100644 (file)
--- 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
 2006-12-06 [colin]     2.6.1cvs6
 
        * src/folderview.c

diff --git a/PATCHSETS b/PATCHSETS
index c80f04612ccf51bc901b03d04933084c6dccf7df..a4dcdfd41ca10c051e6f455e60b030072d5d0b9b 100644 (file)
--- 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.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 00cbd300167a1d66a91f4a3560fde40fa1d6c165..96799c425d535fa7d9ad8ee00167824f75133323 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=6
+EXTRA_VERSION=7

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index a1ca413de4a95f0466fe57895d1ddf73afc7e580..913c00f511dc3c8838808d0fc7c74616986ab897 100644 (file)
--- 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, &param, &result, connect_ssl_run);
        
        refresh_resolvers();
        threaded_run(folder, &param, &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, &param) < 0)
                        return -1;
                cert_len = mailstream_ssl_get_certificate(imap->imap_stream, &certificate);
                if (etpan_certificate_check(certificate, cert_len, &param) < 0)
                        return -1;