Mercurial > pidgin.yaz
diff libpurple/certificate.c @ 24838:0d7c21b5f1d7
propagate from branch 'im.pidgin.pidgin' (head c06356e8e8d2c586f0192a5564053c2584020da8)
to branch 'im.pidgin.pidgin.openq' (head a7077bc12b850d60ea7d768f4b9d4ee6ae6ad2c1)
| author | SHiNE CsyFeK <csyfek@gmail.com> |
|---|---|
| date | Thu, 25 Dec 2008 14:06:10 +0000 |
| parents | 7608cf033a88 |
| children | fc8fd4fef166 a6e3cb32cdd2 421857b25052 |
line wrap: on
line diff
--- a/libpurple/certificate.c Wed Dec 17 13:52:00 2008 +0000 +++ b/libpurple/certificate.c Thu Dec 25 14:06:10 2008 +0000 @@ -748,9 +748,9 @@ # ifdef SSL_CERTIFICATES_DIR x509_ca_paths = g_list_append(NULL, g_strdup(SSL_CERTIFICATES_DIR)); # else - x509_ca_paths = g_list_append(NULL, g_build_filename(DATADIR, - "purple", "ca-certs", NULL)); # endif + x509_ca_paths = g_list_append(x509_ca_paths, + g_build_filename(DATADIR, "purple", "ca-certs", NULL)); #endif } @@ -1259,6 +1259,7 @@ "to cert_changed.\n"); /* vrq now becomes the problem of cert_changed */ x509_tls_cached_peer_cert_changed(vrq); + return; } /* Now get SHA1 sums for both and compare them */