External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor policycode auth code to avoid compiler warnings

Browse Source 
* src/remote_internal.c: Split remoteAuthPolkit into separate
  impls for v0 and v1 to avoid compile warnings due to unused
  variables/params
* qemud/remote.c: Remove accidental tabs
This commit is contained in:
Daniel P. Berrange 2009-08-25 17:18:27 +01:00
parent 8e06c8b3da
commit 3badeffb05
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qemud/remote.c
View File

@ -3154,12 +3154,12 @@ remoteDispatchAuthPolkit (struct qemud_server *server,
rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid); rv = snprintf(pidbuf, sizeof pidbuf, "%d", callerPid);
if (rv < 0 || rv >= sizeof pidbuf) { if (rv < 0 || rv >= sizeof pidbuf) {
VIR_ERROR(_("Caller PID was too large %d"), callerPid); VIR_ERROR(_("Caller PID was too large %d"), callerPid);
goto authfail; goto authfail;
} }
if (virRun(NULL, pkcheck, &status) < 0) { if (virRun(NULL, pkcheck, &status) < 0) {
VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH); VIR_ERROR(_("Cannot invoke %s"), PKCHECK_PATH);
goto authfail; goto authfail;
} }
if (status != 0) { if (status != 0) {
VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d\n"), VIR_ERROR(_("Policy kit denied action %s from pid %d, uid %d, result: %d\n"),

30
src/remote_internal.c
View File

@ -6194,6 +6194,25 @@ remoteAuthSASL (virConnectPtr conn, struct private_data *priv, int in_open,
#if HAVE_POLKIT #if HAVE_POLKIT
#if HAVE_POLKIT1
static int
remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
virConnectAuthPtr auth ATTRIBUTE_UNUSED)
{
remote_auth_polkit_ret ret;
DEBUG0("Client initialize PolicyKit-1 authentication");
memset (&ret, 0, sizeof ret);
if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT,
(xdrproc_t) xdr_void, (char *)NULL,
(xdrproc_t) xdr_remote_auth_polkit_ret, (char *) &ret) != 0) {
return -1; /* virError already set by call */
}
DEBUG0("PolicyKit-1 authentication complete");
return 0;
}
#elif HAVE_POLKIT0
/* Perform the PolicyKit authentication process /* Perform the PolicyKit authentication process
*/ */
static int static int
@ -6201,7 +6220,6 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
virConnectAuthPtr auth) virConnectAuthPtr auth)
{ {
remote_auth_polkit_ret ret; remote_auth_polkit_ret ret;
#if HAVE_POLKIT0
int i, allowcb = 0; int i, allowcb = 0;
virConnectCredential cred = { virConnectCredential cred = {
VIR_CRED_EXTERNAL, VIR_CRED_EXTERNAL,
@ -6211,10 +6229,8 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
NULL, NULL,
0, 0,
}; };
#endif DEBUG0("Client initialize PolicyKit-0 authentication");
DEBUG0("Client initialize PolicyKit authentication");
#if HAVE_POLKIT0
if (auth && auth->cb) { if (auth && auth->cb) {
/* Check if the necessary credential type for PolicyKit is supported */ /* Check if the necessary credential type for PolicyKit is supported */
for (i = 0 ; i < auth->ncredtype ; i++) { for (i = 0 ; i < auth->ncredtype ; i++) {
@ -6237,9 +6253,6 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
} else { } else {
DEBUG0("No auth callback provided"); DEBUG0("No auth callback provided");
} }
#else
DEBUG0("No auth callback required for PolicyKit-1");
#endif
memset (&ret, 0, sizeof ret); memset (&ret, 0, sizeof ret);
if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT, if (call (conn, priv, in_open, REMOTE_PROC_AUTH_POLKIT,
@ -6248,9 +6261,10 @@ remoteAuthPolkit (virConnectPtr conn, struct private_data *priv, int in_open,
return -1; /* virError already set by call */ return -1; /* virError already set by call */
} }
DEBUG0("PolicyKit authentication complete"); DEBUG0("PolicyKit-0 authentication complete");
return 0; return 0;
} }
#endif /* HAVE_POLKIT0 */
#endif /* HAVE_POLKIT */ #endif /* HAVE_POLKIT */
/*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/