From: Christophe Fergeau <cfergeau@redhat.com>
Date: Wed, 18 Sep 2013 12:01:27 +0000 (+0200)
Subject: daemon: Don't hardcode pki paths in help output
X-Git-Tag: CVE-2013-4311~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0d013d9fba12e49d41284839e11cf3f2664d4cd;p=thirdparty%2Flibvirt.git

daemon: Don't hardcode pki paths in help output

There are constants for these paths in remote_driver.h so we can
use these rather than duplicating them in the help output.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 87d42b2110..f714cb1c05 100644
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1063,9 +1063,9 @@ daemonUsage(const char *argv0, bool privileged)
                   "      %s/run/libvirt/libvirt-sock-ro\n"
                   "\n"
                   "    TLS:\n"
-                  "      CA certificate:     %s/pki/CA/cacert.pem\n"
-                  "      Server certificate: %s/pki/libvirt/servercert.pem\n"
-                  "      Server private key: %s/pki/libvirt/private/serverkey.pem\n"
+                  "      CA certificate:     %s\n"
+                  "      Server certificate: %s\n"
+                  "      Server private key: %s\n"
                   "\n"
                   "    PID file (unless overridden by -p):\n"
                   "      %s/run/libvirtd.pid\n"
@@ -1073,9 +1073,9 @@ daemonUsage(const char *argv0, bool privileged)
                 SYSCONFDIR,
                 LOCALSTATEDIR,
                 LOCALSTATEDIR,
-                SYSCONFDIR,
-                SYSCONFDIR,
-                SYSCONFDIR,
+                LIBVIRT_CACERT,
+                LIBVIRT_SERVERCERT,
+                LIBVIRT_SERVERKEY,
                 LOCALSTATEDIR);
     } else {
         fprintf(stderr, "%s",