From: Christophe Fergeau Date: Wed, 18 Sep 2013 14:45:14 +0000 (+0200) Subject: daemon: Remove more hardcoded paths from help output X-Git-Tag: CVE-2013-7336~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1533322211a59cebbe39af36df4bb7687312aba2;p=thirdparty%2Flibvirt.git 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 f714cb1c05..99c0342afe 100644 --- 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,