External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-16 22:57:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when no auth callback is provided

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-01-02 22:48:04 +00:00
parent 935490d9e9
commit 76122538b6
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jan 2 17:45:53 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* src/remote_internal.c: fix policykit auth handling of NULL
callbacks to not crash
Wed Dec 26 06:38:53 CET 2007 Daniel Veillard <veillard@redhat.com>
* src/openvz.c: patch from Mikhail Pokidko to fix the OpenVZ

32
src/remote_internal.c
View File

@ -2,7 +2,7 @@
* remote_internal.c: driver to provide access to libvirtd running
* on a remote machine
*
* Copyright (C) 2007 Red Hat, Inc.
* Copyright (C) 2007-2008 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -3347,24 +3347,26 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
};
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);