changeset 1655:031eda601e8a

Merge main and crew
author Mikael Berthe <mikael@lilotux.net>
date Tue, 01 Dec 2009 21:59:02 +0100
parents fca9a4c17432 (current diff) 8effa82ae593 (diff)
children fbab3c1300d5
files mcabber/src/xmpp.c
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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!");