External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon: Fix build without polkit

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

2
daemon/remote.c
View File

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