tools: Only use our private path when looking for external commands

Instead of looking for external commands in the path, just look
for them in our private directory.

We want to be conservative early on, and limit what sorta things
we have to maintain later. We can later remove this restriction
if a real use case presents itself.

diff --git a/tools/tool.c b/tools/tool.c
index a2dbcbddf083c282f11b7e7296d8735228c3e32c..dcbb1a50435fe0b55cffaee5d77d169693c2e3e0 100644 (file)
--- a/tools/tool.c
+++ b/tools/tool.c
@@ -194,20 +194,17 @@ exec_external (const char *command,
                char *argv[])
 {
        char *filename;
-       const char *path;
-       char *env;
+       char *path;
 
        if (!asprintf (&filename, "p11-kit-%s", command) < 0)
                return_if_reached ();
 
        /* Add our libexec directory to the path */
-       path = getenv ("PATH");
-       if (!asprintf (&env, "PATH=%s%s%s", path ? path : "", path ? P11_PATH_SEP : "", PRIVATEDIR))
-               return_if_reached ();
-       putenv (env);
+       path = p11_path_build (PRIVATEDIR, filename, NULL);
+       return_if_fail (path != NULL);
 
        argv[0] = filename;
-       execvp (filename, argv);
+       execvp (path, argv);
 }
 
 static void