changeset 1656:fbab3c1300d5

Update fix for ssl_ignore_checks option (changeset 8effa82ae593)
author franky
date Tue, 01 Dec 2009 22:09:05 +0100
parents 031eda601e8a
children c4ee6d99f75b
files mcabber/src/xmpp.c
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mcabber/src/xmpp.c	Tue Dec 01 21:59:02 2009 +0100
+++ b/mcabber/src/xmpp.c	Tue Dec 01 22:09:05 2009 +0100
@@ -776,13 +776,6 @@
 {
   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!");
@@ -819,7 +812,7 @@
     break;
   }
 
-  if (!settings_opt_get_int("ssl_ignore_checks"))
+  if (settings_opt_get_int("ssl_ignore_checks"))
     return LM_SSL_RESPONSE_CONTINUE;
   return LM_SSL_RESPONSE_STOP;
 }