mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
Avoid Coverity DEADCODE warning
Commit '922b7fda' resulted in two DEADCODE warnings from Coverity in remoteDispatchAuthPolkit and virAccessDriverPolkitFormatProcess. Commit '604ae657' modified the daemon.c code to remove the deadcode issue, but did not do so for viracessdriverpolkit.c. This just mimics the same changes
This commit is contained in:
parent
f919cf6917
commit
ab479c9038
@ -76,8 +76,9 @@ virAccessDriverPolkitFormatProcess(const char *actionid)
|
||||
const char *callerTime = NULL;
|
||||
const char *callerUid = NULL;
|
||||
char *ret = NULL;
|
||||
bool supportsuid = false;
|
||||
#ifndef PKCHECK_SUPPORTS_UID
|
||||
static bool polkitInsecureWarned;
|
||||
#endif
|
||||
|
||||
if (!identity) {
|
||||
virAccessError(VIR_ERR_ACCESS_DENIED,
|
||||
@ -109,19 +110,17 @@ virAccessDriverPolkitFormatProcess(const char *actionid)
|
||||
}
|
||||
|
||||
#ifdef PKCHECK_SUPPORTS_UID
|
||||
supportsuid = true;
|
||||
#endif
|
||||
if (supportsuid) {
|
||||
if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)
|
||||
goto cleanup;
|
||||
} else {
|
||||
#else
|
||||
if (!polkitInsecureWarned) {
|
||||
VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure.");
|
||||
VIR_WARN("No support for caller UID with pkcheck. "
|
||||
"This deployment is known to be insecure.");
|
||||
polkitInsecureWarned = true;
|
||||
}
|
||||
if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0)
|
||||
goto cleanup;
|
||||
}
|
||||
#endif
|
||||
|
||||
cleanup:
|
||||
virObjectUnref(identity);
|
||||
|
Loading…
Reference in New Issue
Block a user