From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 25 Dec 2011 23:49:44 +0000 (+0000)
Subject: keys.new-recov, keys.reveal, keyfunc.sh.in: Don't put @bindir@ on the PATH.
X-Git-Tag: 0.99.1~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-keys/commitdiff_plain/5c30c6e62b52a66d5c5f33a6adb81bb882e88339?hp=2a877b7f36d155683f4896c72779a62f20f4b1c3

keys.new-recov, keys.reveal, keyfunc.sh.in: Don't put @bindir@ on the PATH.

Call `shamir' using an explicit pathname instead.
---

diff --git a/keyfunc.sh.in b/keyfunc.sh.in
index bfcb26b..44117e9 100644
--- a/keyfunc.sh.in
+++ b/keyfunc.sh.in
@@ -31,8 +31,6 @@ quis=${0##*/}
 PACKAGE="@PACKAGE@" VERSION="@VERSION@"
 bindir="@bindir@"
 
-case ":$PATH:" in *:"$bindir":*) ;; *) PATH=$bindir:$PATH ;; esac
-
 if [ -f $ETC/keys.conf ]; then . $ETC/keys.conf; fi
 
 case "${KEYS_DEBUG+t}" in t) set -x ;; esac
diff --git a/keys.new-recov b/keys.new-recov
index c5d7fce..08c4ce3 100755
--- a/keys.new-recov
+++ b/keys.new-recov
@@ -102,7 +102,7 @@ done
 c_gensyskey $profile $rdir/new/store secret recov="$recov"
 while read keeper k; do
   read n hunoz <$KEYS/keeper/$keeper/meta
-  shamir issue $k/$n secret | {
+  $bindir/shamir issue $k/$n secret | {
     read param
     echo "$param" >$rdir/new/$keeper.param
     i=0
diff --git a/keys.reveal b/keys.reveal
index a93ec90..a1c0242 100755
--- a/keys.reveal
+++ b/keys.reveal
@@ -133,7 +133,7 @@ if [ $n -lt $t ]; then
   echo >&2 "$quis: share $i revealed; $(( $t - $n )) more required"
 else
   cat $KEYS/recov/$recov/$keeper.param $keeper.*.share >$keeper.shares
-  shamir recover <$keeper.shares >nub.new
+  $bindir/shamir recover <$keeper.shares >nub.new
   c_sysprepare $KEYS/recov/$recov/store
   nubbin=$(nubid <nub.new)
   nubid=$(cat $KEYS/recov/$recov/store/nubid)