File 9ae4ac7a-PolicyKit.patch of Package libvirt.openSUSE_12.1_Update

commit 9ae4ac7ac07d872cd32d0a3a1b1b44730b04bda7
Author: Jim Fehlig <jfehlig@suse.com>
Date:   Tue Jan 3 11:35:06 2012 -0700

    PolicyKit: Check auth before asking client to obtain it
    
    I previously mentioned [1] a PolicyKit issue where libvirt would
    proceed with authentication even though polkit-auth failed:
    
    testusr xen134:~> virsh list --all
    Attempting to obtain authorization for org.libvirt.unix.manage.
    polkit-grant-helper: given auth type (8 -> yes) is bogus
    Failed to obtain authorization for org.libvirt.unix.manage.
     Id Name                 State
    ----------------------------------
      0 Domain-0             running
      - sles11sp1-pv         shut off
    
    AFAICT, libvirt attempts to obtain a privilege it already has,
    causing polkit-auth to fail with above message.  Instead of calling
    obtain and then checking auth, IMO the workflow should be for the
    server to check auth first, and if that fails ask the client to
    obtain it and check again.  This workflow also allows for checking
    only successful exit of polkit-auth in virConnectAuthGainPolkit().
    
    [1] https://www.redhat.com/archives/libvir-list/2011-December/msg00837.html

Index: libvirt-0.9.6/src/remote/remote_driver.c
===================================================================
--- libvirt-0.9.6.orig/src/remote/remote_driver.c
+++ libvirt-0.9.6/src/remote/remote_driver.c
@@ -2952,6 +2952,14 @@ remoteAuthPolkit (virConnectPtr conn, st
     };
     VIR_DEBUG("Client initialize PolicyKit-0 authentication");
 
+    /* Check auth first and if it succeeds we are done. */
+    memset (&ret, 0, sizeof ret);
+    if (call (conn, priv, 0, REMOTE_PROC_AUTH_POLKIT,
+              (xdrproc_t) xdr_void, (char *)NULL,
+              (xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) == 0)
+        goto out;
+
+    /* Auth failed.  Ask client to obtain it and check again. */
     if (auth && auth->cb) {
         /* Check if the necessary credential type for PolicyKit is supported */
         for (i = 0 ; i < auth->ncredtype ; i++) {
@@ -2969,9 +2977,11 @@ remoteAuthPolkit (virConnectPtr conn, st
             }
         } else {
             VIR_DEBUG("Client auth callback does not support PolicyKit");
+            return -1;
         }
     } else {
         VIR_DEBUG("No auth callback provided");
+        return -1;
     }
 
     memset (&ret, 0, sizeof ret);
@@ -2981,6 +2991,7 @@ remoteAuthPolkit (virConnectPtr conn, st
         return -1; /* virError already set by call */
     }
 
+out:
     VIR_DEBUG("PolicyKit-0 authentication complete");
     return 0;
 }
Index: libvirt-0.9.6/src/libvirt.c
===================================================================
--- libvirt-0.9.6.orig/src/libvirt.c
+++ libvirt-0.9.6/src/libvirt.c
@@ -129,8 +129,7 @@ static int virConnectAuthGainPolkit(cons
         return -1;
     }
 
-    if (!WIFEXITED(status) ||
-        (WEXITSTATUS(status) != 0 && WEXITSTATUS(status) != 1)) {
+    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
         return -1;
     }