提交 ab479c90 编写于 作者: J John Ferlan

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
上级 f919cf69
......@@ -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 {
if (!polkitInsecureWarned) {
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;
if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)
goto cleanup;
#else
if (!polkitInsecureWarned) {
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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册