From 64a5dc1b6a5a19f69ae23704c1c5b587374829ff Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 22 Aug 2013 17:02:40 +0100
Subject: [PATCH] Convert callers to use typesafe APIs for getting identity
 attrs

Convert virAccessDriverPolkitFormatProcess to use typesafe API
for getting process ID attribute.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 src/access/viraccessdriverpolkit.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c
index 8ffb828af0..bdb35dbf79 100644
--- a/src/access/viraccessdriverpolkit.c
+++ b/src/access/viraccessdriverpolkit.c
@@ -75,9 +75,9 @@ static char *
 virAccessDriverPolkitFormatProcess(const char *actionid)
 {
     virIdentityPtr identity = virIdentityGetCurrent();
-    const char *callerPid = NULL;
-    const char *callerTime = NULL;
-    const char *callerUid = NULL;
+    pid_t pid;
+    unsigned long long startTime;
+    uid_t uid;
     char *ret = NULL;
 #ifndef PKCHECK_SUPPORTS_UID
     static bool polkitInsecureWarned;
@@ -89,39 +89,35 @@ virAccessDriverPolkitFormatProcess(const char *actionid)
                        actionid);
         return NULL;
     }
-    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_ID, &callerPid) < 0)
+    if (virIdentityGetUNIXProcessID(identity, &pid) < 0)
         goto cleanup;
-    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_PROCESS_TIME, &callerTime) < 0)
+    if (virIdentityGetUNIXProcessTime(identity, &startTime) < 0)
         goto cleanup;
-    if (virIdentityGetAttr(identity, VIR_IDENTITY_ATTR_UNIX_USER_ID, &callerUid) < 0)
+    if (virIdentityGetUNIXUserID(identity, &uid) < 0)
         goto cleanup;
 
-    if (!callerPid) {
+    if (!pid) {
         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("No UNIX process ID available"));
         goto cleanup;
     }
-    if (!callerTime) {
+    if (!startTime) {
         virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("No UNIX process start time available"));
         goto cleanup;
     }
-    if (!callerUid) {
-        virAccessError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("No UNIX caller UID available"));
-        goto cleanup;
-    }
 
 #ifdef PKCHECK_SUPPORTS_UID
-    if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0)
+    if (virAsprintf(&ret, "%llu,%llu,%llu",
+                    (unsigned long long)pid, startTime, (unsigned long long)uid) < 0)
         goto cleanup;
 #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)
+    if (virAsprintf(&ret, "%llu,%llu",
+                    (unsigned long long)pid, startTime) < 0)
         goto cleanup;
 #endif
 
-- 
GitLab