[PATCH 19/20] util: stop hardcoding pkttyagent path

From: Daniel P. Berrangé <berrange(a)redhat.com&gt; Allow virCommand to find it in $PATH Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/util/virpolkit.c | 8 +++++--- src/util/virpolkit.h | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 0a637db9ba..81fa5d0989 100644 --- 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 7bcd040e5e..afc0005365 100644 --- 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, -- 2.49.0