openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Erik Skultety 2016-07-26 14:06:13 +02:00
parent 3b9c60af46
commit c5d0a2a385
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt.c
View File

@ -969,7 +969,7 @@ virConnectOpenInternal(const char *name,
if (ret == NULL)
return NULL;
if (virConfLoadConfig(&conf, NULL) < 0)
if (virConfLoadConfig(&conf, "libvirt.conf") < 0)
goto failed;
if (name && name[0] == '\0')

12
src/util/virconf.c
View File

@ -1566,20 +1566,16 @@ virConfLoadConfigPath(const char *name)
{
char *path;
if (geteuid() == 0) {
if (virAsprintf(&path, "%s/libvirt/libvirt%s%s.conf",
SYSCONFDIR,
name ? "-" : "",
name ? name : "") < 0)
if (virAsprintf(&path, "%s/libvirt/%s",
SYSCONFDIR, name) < 0)
return NULL;
} else {
char *userdir = virGetUserConfigDirectory();
if (!userdir)
return NULL;
if (virAsprintf(&path, "%s/libvirt%s%s.conf",
userdir,
name ? "-" : "",
name ? name : "") < 0) {
if (virAsprintf(&path, "%s/%s",
userdir, name) < 0) {
VIR_FREE(userdir);
return NULL;
}