[libvirt] [PATCH v2 4/5] add support for apparmor in lxc-enter-namespace

[Daniel P. Berrange]

On Mon, Mar 03, 2014 at 11:26:45AM +0100, Cédric Bosdonnat wrote:
> ---
>  examples/apparmor/libvirt-lxc |  7 +++++++
>  src/libvirt-lxc.c             | 13 +++++++++++++
>  2 files changed, 20 insertions(+)

> diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
> index 074809a..f10fafc 100644
> --- a/src/libvirt-lxc.c
> +++ b/src/libvirt-lxc.c

> @@ -240,6 +243,16 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model,
>                         _("Support for SELinux is not enabled"));
>          goto error;
>  #endif
> +    } else if (STREQ(model->model, "apparmor")) {
> +#ifdef WITH_APPARMOR
> +        if (aa_change_profile(label->label) < 0)
> +            virReportSystemError(errno, _("error changing profile to %s"),
> +                                 label->label);

Missing 'goto error' 

> +#else
> +        virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
> +                       _("Support for AppArmor is not enabled"));
> +        goto error;
> +#endif
>      } else {
>          virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED,
>                         _("Security model %s cannot be entered"),

ACK, I'll fix the missing goto when pushing

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|