[libvirt] [PATCH] Pass virSecurityManagerPtr to virSecurityDAC{Set, Restore}ChardevCallback

[Daniel P. Berrange]

On Thu, Mar 03, 2011 at 03:47:48PM +0100, Soren Hansen wrote:
> virSecurityDAC{Set,Restore}ChardevCallback expect virSecurityManagerPtr,
> but are passed virDomainObjPtr instead. This makes
> virSecurityDACSetChardevLabel set a wrong uid/gid on chardevs. This
> patch fixes this behaviour.
> 
> Signed-off-by: Soren Hansen <soren at linux2go.dk>
> ---
>  src/security/security_dac.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/security/security_dac.c b/src/security/security_dac.c
> index 1c1a037..b8de232 100644
> --- a/src/security/security_dac.c
> +++ b/src/security/security_dac.c
> @@ -509,7 +509,7 @@ virSecurityDACRestoreSecurityAllLabel(virSecurityManagerPtr mgr,
>      if (virDomainChrDefForeach(vm->def,
>                                 false,
>                                 virSecurityDACRestoreChardevCallback,
> -                               vm) < 0)
> +                               mgr) < 0)
>          rc = -1;
>  
>      if (vm->def->os.kernel &&
> @@ -565,7 +565,7 @@ virSecurityDACSetSecurityAllLabel(virSecurityManagerPtr mgr,
>      if (virDomainChrDefForeach(vm->def,
>                                 true,
>                                 virSecurityDACSetChardevCallback,
> -                               vm) < 0)
> +                               mgr) < 0)
>          return -1;

ACK


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 :|