External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

* qemud/qemud.c: patch from Guido Günther fixing the place where

Browse Source 
config file check is done.
Daniel
This commit is contained in:
Daniel Veillard 2008-07-30 08:47:10 +00:00
parent 654c5714bf
commit a8f10951d0
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jul 30 10:45:41 CEST 2008 Daniel Veillard <veillard@redhat.com>
* qemud/qemud.c: patch from Guido Günther fixing the place where
config file check is done.
Tue Jul 29 14:08:00 CEST 2008 Chris Lalancette <clalance@redhat.com> Tue Jul 29 14:08:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
* src/qemu_conf.c: fix empty CD-ROM source device section * src/qemu_conf.c: fix empty CD-ROM source device section
@ -5,7 +10,7 @@ Tue Jul 29 14:08:00 CEST 2008 Chris Lalancette <clalance@redhat.com>
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml, tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml,
tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args: Add test tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args: Add test
for empty source CD-ROM device section for empty source CD-ROM device section
Tue Jul 29 10:41:30 CEST 2008 Daniel Veillard <veillard@redhat.com> Tue Jul 29 10:41:30 CEST 2008 Daniel Veillard <veillard@redhat.com>
* src/openvz_conf.c: fix compilation with new XPath interface * src/openvz_conf.c: fix compilation with new XPath interface

16
qemud/qemud.c
View File

@ -1912,6 +1912,14 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
char *unix_sock_rw_perms = NULL; char *unix_sock_rw_perms = NULL;
char *unix_sock_group = NULL; char *unix_sock_group = NULL;
#if HAVE_POLKIT
/* Change the default back to no auth for non-root */
if (getuid() != 0 && auth_unix_rw == REMOTE_AUTH_POLKIT)
auth_unix_rw = REMOTE_AUTH_NONE;
if (getuid() != 0 && auth_unix_ro == REMOTE_AUTH_POLKIT)
auth_unix_ro = REMOTE_AUTH_NONE;
#endif
/* Just check the file is readable before opening it, otherwise /* Just check the file is readable before opening it, otherwise
* libvirt emits an error. * libvirt emits an error.
*/ */
@ -1926,14 +1934,6 @@ remoteReadConfigFile (struct qemud_server *server, const char *filename)
GET_CONF_STR (conf, filename, tcp_port); GET_CONF_STR (conf, filename, tcp_port);
GET_CONF_STR (conf, filename, listen_addr); GET_CONF_STR (conf, filename, listen_addr);
#if HAVE_POLKIT
/* Change the default back to no auth for non-root */
if (getuid() != 0 && auth_unix_rw == REMOTE_AUTH_POLKIT)
auth_unix_rw = REMOTE_AUTH_NONE;
if (getuid() != 0 && auth_unix_ro == REMOTE_AUTH_POLKIT)
auth_unix_ro = REMOTE_AUTH_NONE;
#endif
if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0) if (remoteConfigGetAuth(conf, "auth_unix_rw", &auth_unix_rw, filename) < 0)
goto free_and_fail; goto free_and_fail;
#if HAVE_POLKIT #if HAVE_POLKIT