Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/xmpp.c @ 1656:fbab3c1300d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update fix for ssl_ignore_checks option (changeset 8effa82ae593)
author franky
date Tue, 01 Dec 2009 22:09:05 +0100
parents 031eda601e8a
children dcb0b4522ded
comparison
equal deleted inserted replaced
1655:031eda601e8a 1656:fbab3c1300d5
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 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;
785
786 switch (status) { 779 switch (status) {
787 case LM_SSL_STATUS_NO_CERT_FOUND: 780 case LM_SSL_STATUS_NO_CERT_FOUND:
788 scr_LogPrint(LPRINT_LOGNORM, "No certificate found!"); 781 scr_LogPrint(LPRINT_LOGNORM, "No certificate found!");
789 break; 782 break;
790 case LM_SSL_STATUS_UNTRUSTED_CERT: 783 case LM_SSL_STATUS_UNTRUSTED_CERT:
817 case LM_SSL_STATUS_GENERIC_ERROR: 810 case LM_SSL_STATUS_GENERIC_ERROR:
818 scr_LogPrint(LPRINT_LOGNORM, "Generic SSL error!"); 811 scr_LogPrint(LPRINT_LOGNORM, "Generic SSL error!");
819 break; 812 break;
820 } 813 }
821 814
822 if (!settings_opt_get_int("ssl_ignore_checks")) 815 if (settings_opt_get_int("ssl_ignore_checks"))
823 return LM_SSL_RESPONSE_CONTINUE; 816 return LM_SSL_RESPONSE_CONTINUE;
824 return LM_SSL_RESPONSE_STOP; 817 return LM_SSL_RESPONSE_STOP;
825 } 818 }
826 819
827 static void connection_auth_cb(LmConnection *connection, gboolean success, 820 static void connection_auth_cb(LmConnection *connection, gboolean success,