External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compliation of AppArmor related code

Browse Source 
Broken by the latest commits to remove the virConnectPtr parameter
from internal functions.
This commit is contained in:
Matthias Bolte 2010-02-12 00:09:59 +01:00
parent 618e1ab349
commit af7c18f7a2
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/security/security_apparmor.c
View File

@ -262,7 +262,7 @@ use_apparmor(void)
char *libvirt_daemon = NULL; char *libvirt_daemon = NULL;
if (virFileResolveLink("/proc/self/exe", &libvirt_daemon) < 0) { if (virFileResolveLink("/proc/self/exe", &libvirt_daemon) < 0) {
virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, virSecurityReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("could not find libvirtd")); "%s", _("could not find libvirtd"));
return rc; return rc;
} }
@ -295,7 +295,7 @@ AppArmorSecurityDriverProbe(void)
} }
if (!virFileExists(template)) { if (!virFileExists(template)) {
virSecurityReportError(NULL, VIR_ERR_INTERNAL_ERROR, virSecurityReportError(VIR_ERR_INTERNAL_ERROR,
_("template \'%s\' does not exist"), template); _("template \'%s\' does not exist"), template);
goto clean; goto clean;
} }

8
src/security/virt-aa-helper.c
View File

@ -690,7 +690,7 @@ get_definition(vahControl * ctl, const char *xmlStr)
goto exit; goto exit;
} }
ctl->def = virDomainDefParseString(NULL, ctl->caps, xmlStr, 0); ctl->def = virDomainDefParseString(ctl->caps, xmlStr, 0);
if (ctl->def == NULL) { if (ctl->def == NULL) {
vah_error(ctl, 0, "could not parse XML"); vah_error(ctl, 0, "could not parse XML");
goto exit; goto exit;
@ -767,8 +767,7 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms)
} }
static int static int
file_iterate_cb(virConnectPtr conn ATTRIBUTE_UNUSED, file_iterate_cb(usbDevice *dev ATTRIBUTE_UNUSED,
usbDevice *dev ATTRIBUTE_UNUSED,
const char *file, void *opaque) const char *file, void *opaque)
{ {
virBufferPtr buf = opaque; virBufferPtr buf = opaque;
@ -844,8 +843,7 @@ get_files(vahControl * ctl)
if (usb == NULL) if (usb == NULL)
continue; continue;
rc = usbDeviceFileIterate(NULL, usb, rc = usbDeviceFileIterate(usb, file_iterate_cb, &buf);
file_iterate_cb, &buf);
usbFreeDevice(usb); usbFreeDevice(usb);
if (rc != 0) if (rc != 0)
goto clean; goto clean;