switch from execv to execvp to find base64 wherever it is in the path.

diff --git a/src/keytrans/gnutls-helpers.c b/src/keytrans/gnutls-helpers.c
index 7c4348dc0e8dd58048094ea475dc90cc82867634..8d8ec17ae31f23a308380d90daa31956877374d2 100644 (file)
--- a/src/keytrans/gnutls-helpers.c
+++ b/src/keytrans/gnutls-helpers.c
@@ -387,7 +387,7 @@ int create_writing_pipe(pid_t* pid, const char* path, char* const argv[]) {
       err(0,"Failed to transfer reading file descriptor to stdin (error: %d \"%s\")\n", errno, strerror(errno));
       exit(1);
     }
-    execv(path, argv);
+    execvp(path, argv);
     err(0,"exec %s failed (error: %d \"%s\")\n", path, errno, strerror(errno));
     /* close the open file descriptors */
     close(p[0]);

diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c
index 36fb30a77d62b889714a21f0bc3db831ecbb02ec..427adc8f27ea5994652deda6fd88cb2ef6779ef1 100644 (file)
--- a/src/keytrans/openpgp2ssh.c
+++ b/src/keytrans/openpgp2ssh.c
@@ -208,7 +208,7 @@ int emit_public_openssh_from_pgp(const gnutls_openpgp_crt_t* pgp_crt, const unsi
   /* variables for the output conversion: */
   int pipestatus;
   int pipefd, child_pid;
-  char* const b64args[] = {"/usr/bin/base64", "--wrap=0", NULL};
+  char* const b64args[] = {"base64", "--wrap=0", NULL};
 
   init_datum(&m);
   init_datum(&e);