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

daemon: Fix build without polkit

This commit is contained in:
Jiri Denemark 2011-06-28 21:09:05 +02:00
parent cf2affffcc
commit 26dbed1516
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/libvirtd.c
View File

@ -874,7 +874,7 @@ static void
daemonConfigFree(struct daemonConfig *data);
static struct daemonConfig*
daemonConfigNew(bool privileged)
daemonConfigNew(bool privileged ATTRIBUTE_UNUSED)
{
struct daemonConfig *data;
char *localhost;
@ -1034,8 +1034,10 @@ daemonConfigLoad(struct daemonConfig *data,
*/
if (data->auth_unix_rw == REMOTE_AUTH_POLKIT) {
VIR_FREE(data->unix_sock_rw_perms);
if (!(data->unix_sock_rw_perms = strdup("0777")))
goto no_memory;
if (!(data->unix_sock_rw_perms = strdup("0777"))) {
virReportOOMError();
goto error;
}
}
#endif
if (remoteConfigGetAuth(conf, "auth_unix_ro", &data->auth_unix_ro, filename) < 0)
@ -1091,8 +1093,6 @@ daemonConfigLoad(struct daemonConfig *data,
virConfFree (conf);
return 0;
no_memory:
virReportOOMError();
error:
virConfFree (conf);
return -1;

2
daemon/remote.c
View File

@ -2209,7 +2209,7 @@ authdeny:
static int
remoteDispatchAuthPolkit(virNetServerPtr server ATTRIBUTE_UNUSED,
virNetServerClientPtr client,
virNetServerClientPtr client ATTRIBUTE_UNUSED,
virNetMessageHeaderPtr hdr ATTRIBUTE_UNUSED,
virNetMessageErrorPtr rerr,
remote_auth_polkit_ret *ret ATTRIBUTE_UNUSED)