From: Doug Goldstein <cardoe@gentoo.org>
Date: Thu, 5 May 2011 22:54:52 +0000 (-0500)
Subject: virsh: improve TLS certificate error messages
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1945d74cc38bc2b71b0a95aaa74c2e550140b248;p=libvirt.git

virsh: improve TLS certificate error messages

Print the name of the CA cert, certificate, and key file that resulted
in the failure so that the user has an idea what to troubleshoot.

Signed-off-by: Doug Goldstein <cardoe@gentoo.org>
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index e30780cc93..4c3bdf347a 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1268,8 +1268,8 @@ initialize_gnutls(char *pkipath, int flags)
                                                 GNUTLS_X509_FMT_PEM);
     if (err < 0) {
         remoteError(VIR_ERR_GNUTLS_ERROR,
-                    _("unable to load CA certificate: %s"),
-                    gnutls_strerror (err));
+                    _("unable to load CA certificate '%s': %s"),
+                    libvirt_cacert, gnutls_strerror (err));
         goto error;
     }
 
@@ -1283,8 +1283,9 @@ initialize_gnutls(char *pkipath, int flags)
                                               GNUTLS_X509_FMT_PEM);
     if (err < 0) {
         remoteError(VIR_ERR_GNUTLS_ERROR,
-                    _("unable to load private key/certificate: %s"),
-                    gnutls_strerror (err));
+                    _("unable to load private key '%s' and/or "
+                    "certificate '%s': %s"), libvirt_clientkey,
+                    libvirt_clientcert, gnutls_strerror (err));
         goto error;
     }