[libvirt] [PATCH 2/2] selinux: remove unused variables in socket labelling

[Eric Blake]

On 10/16/2012 09:32 PM, Guannan Ren wrote:
> ---
>  src/security/security_selinux.c | 4 ----
>  1 file changed, 4 deletions(-)

ACK.  [Meanwhile, I'm still testing 1/2 to see if it fixes the problem I
ran into today...]

> 
> diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
> index 85419ba..b5108ab 100644
> --- a/src/security/security_selinux.c
> +++ b/src/security/security_selinux.c
> @@ -1634,8 +1634,6 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr,
>  {
>      /* TODO: verify DOI */
>      virSecurityLabelDefPtr secdef;
> -    context_t execcon = NULL;
> -    context_t proccon = NULL;
>      security_context_t scon = NULL;
>      char *str = NULL;
>      int rc = -1;
> @@ -1678,8 +1676,6 @@ done:
>  
>      if (security_getenforce() != 1)
>          rc = 0;
> -    if (execcon) context_free(execcon);
> -    if (proccon) context_free(proccon);
>      freecon(scon);
>      VIR_FREE(str);
>      return rc;
> 

-- 
Eric Blake   eblake at redhat.com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 617 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20121016/fd3a82a3/attachment-0001.sig>