[Pkg-wmaker-commits] [wmbiff] 01/38: handle certfile errors properly; positive return values from gnutls_certificate_set_x509_trust_file appear okay.

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to tag wmbiff_0_4_16
in repository wmbiff.

commit 81a6f012124c9b60bc48654e27a0a770ff651359
Author: bluehal <bluehal>
Date:   Mon Apr 7 09:16:08 2003 +0000

    handle certfile errors properly; positive return values from gnutls_certificate_set_x509_trust_file appear okay.
---
 wmbiff/tlsComm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wmbiff/tlsComm.c b/wmbiff/tlsComm.c
index 299c8a4..e76879e 100644
--- a/wmbiff/tlsComm.c
+++ b/wmbiff/tlsComm.c
@@ -284,7 +284,7 @@ bad_certificate(const struct connection_state *scs, const char *msg)
 	TDM(DEBUG_ERROR, "%s", msg);
 	if (!SkipCertificateCheck) {
 		TDM(DEBUG_ERROR, "to ignore this error, run wmbiff "
-			"with the -skip-certificate-check option");
+			"with the -skip-certificate-check option\n");
 		exit(1);
 	}
 }
@@ -410,10 +410,10 @@ struct connection_state *initialize_gnutls(int sd, char *name, Pop3 pc,
 														 (char *)
 														 certificate_filename,
 														 GNUTLS_X509_FMT_PEM);
-			if (zok != 0) {
+			if (zok < 0) {
 				DMA(DEBUG_ERROR,
-					"GNUTLS did not like your certificate file %s.\n",
-					certificate_filename);
+					"GNUTLS did not like your certificate file %s (%d).\n",
+					certificate_filename, zok);
 				gnutls_perror(zok);
 				exit(1);
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbiff.git