daemon: Remove more hardcoded paths from help output

A previous patch used existing #define for the various files in /etc/pki
instead of hardcoding them in the help output. However I missed that
remote_driver.h contains #define for more paths that are present
in the daemon help output.
This commit uses the existing constants for the path to the
configuration file and to the libvirt sockets.

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index f714cb1c052f2a3b0deee9a356f84db98fca6bb8..99c0342afe9e1b027b4c7cd913f66a16934886c4 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -1056,11 +1056,11 @@ daemonUsage(const char *argv0, bool privileged)
                   "  Default paths:\n"
                   "\n"
                   "    Configuration file (unless overridden by -f):\n"
-                  "      %s/libvirt/libvirtd.conf\n"
+                  "      %s\n"
                   "\n"
                   "    Sockets:\n"
-                  "      %s/run/libvirt/libvirt-sock\n"
-                  "      %s/run/libvirt/libvirt-sock-ro\n"
+                  "      %s\n"
+                  "      %s\n"
                   "\n"
                   "    TLS:\n"
                   "      CA certificate:     %s\n"
@@ -1070,9 +1070,9 @@ daemonUsage(const char *argv0, bool privileged)
                   "    PID file (unless overridden by -p):\n"
                   "      %s/run/libvirtd.pid\n"
                   "\n"),
-                SYSCONFDIR,
-                LOCALSTATEDIR,
-                LOCALSTATEDIR,
+                LIBVIRTD_CONFIGURATION_FILE,
+                LIBVIRTD_PRIV_UNIX_SOCKET,
+                LIBVIRTD_PRIV_UNIX_SOCKET_RO,
                 LIBVIRT_CACERT,
                 LIBVIRT_SERVERCERT,
                 LIBVIRT_SERVERKEY,