From ab479c903807b92027f73e3a535e73b08695e1e0 Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Fri, 18 Oct 2013 06:43:47 -0400
Subject: [PATCH] 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
---
 src/access/viraccessdriverpolkit.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
index ff8258306a..c32573900c 100644
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -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);