]> git.ipfire.org Git - thirdparty/libvirt.git/commit
virconf: Fix config file path construction
authorErik Skultety <eskultet@redhat.com>
Tue, 26 Jul 2016 12:06:13 +0000 (14:06 +0200)
committerErik Skultety <eskultet@redhat.com>
Wed, 27 Jul 2016 10:13:13 +0000 (12:13 +0200)
commitc5d0a2a38525929515337ea21cb5c19903ccb05c
tree43f0cbefd6b368f06cd0bb9a0b8ff74418156209
parent3b9c60af46c632d4d969e6b44bb957279d13b0e4
virconf: Fix config file path construction

Since commit c4bdff19, the path to the configuration file has been constructed
in the following manner:
 - if no config filename was passed to virConfLoadConfigPath, libvirt.conf was
 used as default
 - otherwise the filename was concatenated with
 "<config_dir>/libvirt/libvirt%s%s.conf" which in admin case resulted in
 "libvirt-libvirt-admin.conf.conf". Obviously, this non-existent config led to
 ignoring  all user settings in libvirt-admin.conf. This patch requires the
 config filename to be always provided as an argument with the concatenation
 being simplified.

 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1357364

Signed-off-by: Erik Skultety <eskultet@redhat.com>
src/libvirt.c
src/util/virconf.c