comparison mcabber/src/xmpp.c @ 1655:031eda601e8a

Merge main and crew
author Mikael Berthe <mikael@lilotux.net>
date Tue, 01 Dec 2009 21:59:02 +0100
parents fca9a4c17432 8effa82ae593
children fbab3c1300d5
comparison
equal deleted inserted replaced
1653:fca9a4c17432 1655:031eda601e8a
773 } 773 }
774 774
775 static LmSSLResponse ssl_cb(LmSSL *ssl, LmSSLStatus status, gpointer ud) 775 static LmSSLResponse ssl_cb(LmSSL *ssl, LmSSLStatus status, gpointer ud)
776 { 776 {
777 scr_LogPrint(LPRINT_LOGNORM, "SSL status:%d", status); 777 scr_LogPrint(LPRINT_LOGNORM, "SSL status:%d", status);
778
779 // no need for message if user not requested ssl and
780 // set ignore_checks
781 if (settings_opt_get_int("ssl_ignore_checks") &&
782 !((settings_opt_get("ssl") || settings_opt_get("tls")) &&
783 (settings_opt_get_int("ssl") || settings_opt_get_int("tls"))))
784 return LM_SSL_RESPONSE_CONTINUE;
778 785
779 switch (status) { 786 switch (status) {
780 case LM_SSL_STATUS_NO_CERT_FOUND: 787 case LM_SSL_STATUS_NO_CERT_FOUND:
781 scr_LogPrint(LPRINT_LOGNORM, "No certificate found!"); 788 scr_LogPrint(LPRINT_LOGNORM, "No certificate found!");
782 break; 789 break;