--- a/ChangeLog	Fri Feb 25 10:38:17 2005 +0000
+++ b/ChangeLog	Thu Mar 31 16:03:59 2005 +0000
@@ -1,3 +1,10 @@
+2005-03-31  Mikael Hallendal  <micke@imendio.com>
+
+	* loudmouth/lm-debug.h: Correct log domain
+	* loudmouth/lm-ssl.c: (ssl_verify_certificate):
+	- Removed GNUTLS_CERT_NOT_TRUSTED which has been removed from GnuTLS.
+	- Patch from foser@gentoo.org
+
 2005-02-02  Mikael Hallendal  <micke@imendio.com>
 
 	* examples/lm-change-password.c: (print_usage), (main):

--- a/loudmouth/lm-debug.h	Fri Feb 25 10:38:17 2005 +0000
+++ b/loudmouth/lm-debug.h	Thu Mar 31 16:03:59 2005 +0000
@@ -32,7 +32,7 @@
 				LM_LOG_LEVEL_PARSER)
 } LmLogLevelFlags;
 
-#ifndef LL_LOG_DOMAIN
+#ifndef LM_LOG_DOMAIN
 #  define LM_LOG_DOMAIN "LM"
 #endif
 

--- a/loudmouth/lm-ssl.c	Fri Feb 25 10:38:17 2005 +0000
+++ b/loudmouth/lm-ssl.c	Thu Mar 31 16:03:59 2005 +0000
@@ -71,7 +71,6 @@
 	}
 	
 	if (status & GNUTLS_CERT_INVALID
-	    || status & GNUTLS_CERT_NOT_TRUSTED
 	    || status & GNUTLS_CERT_REVOKED) {
 		if (ssl->func (ssl, LM_SSL_STATUS_UNTRUSTED_CERT,
 			       ssl->func_data) != LM_SSL_RESPONSE_CONTINUE) {
@@ -126,7 +125,7 @@
 
 		gnutls_x509_crt_deinit (cert);
 
-		if (gnutls_x509_fingerprint (GNUTLS_DIG_MD5, &cert_list[0],
+		if (gnutls_fingerprint (GNUTLS_DIG_MD5, &cert_list[0],
 					     ssl->fingerprint,
 					     &digest_size) >= 0) {
 			if (ssl->expected_fingerprint &&