[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 2/2] 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>
---
 daemon/libvirtd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 87d42b2..f714cb1 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",
-- 
1.8.3.1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]