]> xenbits.xensource.com Git - libvirt.git/commitdiff
aa-helper: adjust previous patch
authorCédric Bosdonnat <cbosdonnat@suse.com>
Fri, 11 Jul 2014 20:09:05 +0000 (14:09 -0600)
committerEric Blake <eblake@redhat.com>
Fri, 11 Jul 2014 20:14:50 +0000 (14:14 -0600)
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 <eblake@redhat.com>
src/security/virt-aa-helper.c

index d563b986934d8992d891a90a41802a8e525519bc..c8f17f9b05d8f320e616f91a4dbae3edcc8864b3 100644 (file)
@@ -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 */