util: stop hardcoding pkttyagent path

Allow virCommand to find it in $PATH

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c
index 0a637db9baf2fe7380d66e4fc43418ee168f8cc7..81fa5d0989eca588179f1f8d13d44c5f7f2a8550 100644 (file)
--- a/src/util/virpolkit.c
+++ b/src/util/virpolkit.c
@@ -189,7 +189,7 @@ virPolkitAgentCreate(void)
 
     agent = g_new0(virPolkitAgent, 1);
 
-    agent->cmd = virCommandNewArgList(PKTTYAGENT, "--process", NULL);
+    agent->cmd = virCommandNewArgList("pkttyagent", "--process", NULL);
 
     virCommandAddArgFormat(agent->cmd, "%lld", (long long int) getpid());
     virCommandAddArg(agent->cmd, "--notify-fd");
@@ -234,11 +234,13 @@ virPolkitAgentAvailable(void)
 {
     const char *termid = ctermid(NULL);
     VIR_AUTOCLOSE fd = -1;
+    g_autofree char *agent = NULL;
 
-    if (!virFileIsExecutable(PKTTYAGENT))
+    if (!termid)
         return false;
 
-    if (!termid)
+    agent = virFindFileInPath("pkttyagent");
+    if (!agent)
         return false;
 
     /*

diff --git a/src/util/virpolkit.h b/src/util/virpolkit.h
index 7bcd040e5e06cf60275e9b5f4bae0e5431eca13e..afc000536513eb3032a988284ea42dd272573725 100644 (file)
--- a/src/util/virpolkit.h
+++ b/src/util/virpolkit.h
@@ -24,8 +24,6 @@
 #include "internal.h"
 #include "vircommand.h"
 
-#define PKTTYAGENT "/usr/bin/pkttyagent"
-
 int virPolkitCheckAuth(const char *actionid,
                        pid_t pid,
                        unsigned long long startTime,