Attachment 290591 Details for Bug 427107 – Fix crash with auth callback

[patch] Fix crash with auth callback

libvirt-auth-cb.patch (text/plain), 2.04 KB, created by Daniel Berrangé on 2007-12-31 20:36:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-12-31 20:36:01 UTC

Size: 2.04 KB

patch

obsolete

>Index: src/remote_internal.c
>===================================================================
>RCS file: /data/cvs/libvirt/src/remote_internal.c,v
>retrieving revision 1.49
>diff -u -p -r1.49 remote_internal.c
>--- src/remote_internal.c	17 Dec 2007 17:41:02 -0000	1.49
>+++ src/remote_internal.c	31 Dec 2007 20:30:19 -0000
>@@ -3347,24 +3347,26 @@ remoteAuthPolkit (virConnectPtr conn, st
>     };
>     remoteDebug(priv, "Client initialize PolicyKit authentication");
> 
>-    for (i = 0 ; i < auth->ncredtype ; i++) {
>-        if (auth->credtype[i] == VIR_CRED_EXTERNAL)
>-            allowcb = 1;
>-    }
>+    if (auth && auth->cb) {
>+        /* Check if the neccessary credential type for PolicyKit is supported */
>+        for (i = 0 ; i < auth->ncredtype ; i++) {
>+            if (auth->credtype[i] == VIR_CRED_EXTERNAL)
>+                allowcb = 1;
>+        }
> 
>-    /* Run the authentication callback */
>-    if (allowcb) {
>-        if (auth && auth->cb &&
>-            (*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
>-            __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
>-                             VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
>-                             "Failed to collect auth credentials");
>-            return -1;
>+        if (allowcb) {
>+            /* Run the authentication callback */
>+            if ((*(auth->cb))(&cred, 1, auth->cbdata) < 0) {
>+                __virRaiseError (in_open ? NULL : conn, NULL, NULL, VIR_FROM_REMOTE,
>+                                 VIR_ERR_AUTH_FAILED, VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
>+                                 "Failed to collect auth credentials");
>+                return -1;
>+            }
>         } else {
>-            remoteDebug(priv, "No auth callback provided for PolicyKit");
>+            remoteDebug(priv, "Client auth callback does not support PolicyKit");
>         }
>     } else {
>-        remoteDebug(priv, "Client auth callback does not support PolicyKit");
>+        remoteDebug(priv, "No auth callback provided");
>     }
> 
>     memset (&ret, 0, sizeof ret);

Actions: View | Diff

Attachments on bug 427107: 290591