# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1259701142 -3600
# Node ID 031eda601e8aef19bbc83d3039be250d89213f73
# Parent  fca9a4c1743214a401723dd5e3aa8e6afa1c0afc# Parent  8effa82ae593996da4e6909cf8960325f6c13b3c
Merge main and crew

diff -r fca9a4c17432 -r 031eda601e8a mcabber/src/xmpp.c
--- a/mcabber/src/xmpp.c	Tue Dec 01 21:06:06 2009 +0100
+++ b/mcabber/src/xmpp.c	Tue Dec 01 21:59:02 2009 +0100
@@ -776,6 +776,13 @@
 {
   scr_LogPrint(LPRINT_LOGNORM, "SSL status:%d", status);
 
+  // no need for message if user not requested ssl and
+  // set ignore_checks
+  if (settings_opt_get_int("ssl_ignore_checks") &&
+      !((settings_opt_get("ssl") || settings_opt_get("tls")) &&
+        (settings_opt_get_int("ssl") || settings_opt_get_int("tls"))))
+    return LM_SSL_RESPONSE_CONTINUE;
+
   switch (status) {
   case LM_SSL_STATUS_NO_CERT_FOUND:
     scr_LogPrint(LPRINT_LOGNORM, "No certificate found!");