From 9b1e4cd5034225c7f750b38968b576c966c51d75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Bosdonnat?= Date: Fri, 11 Jul 2014 14:09:05 -0600 Subject: [PATCH] aa-helper: adjust previous patch Don't fail when there is nothing to do, as a tweak to the previous patch regarding output of libvirt-UUID.files for LXC apparmor profiles Signed-off-by: Eric Blake --- src/security/virt-aa-helper.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index d563b98693..c8f17f9b05 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -1342,11 +1342,13 @@ main(int argc, char **argv) vah_info(include_file); vah_info(included_files); rc = 0; - } else if (ctl->def->virtType != VIR_DOMAIN_VIRT_LXC && - (rc = update_include_file(include_file, + } else if (ctl->def->virtType == VIR_DOMAIN_VIRT_LXC) { + rc = 0; + } else if ((rc = update_include_file(include_file, included_files, - ctl->append)) != 0) + ctl->append)) != 0) { goto cleanup; + } /* create the profile from TEMPLATE */ -- 2.39.5