X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=c8a7db65425523a59d84ec7aab094e384db96100;hb=85b105c27fb67921199d282dc90d612c9b525bee;hp=40ba8de0c9eb7dc3504ba3535b737329cd878930;hpb=a266aa89051dad0e057c1e042d483b9f86e67e59;p=monkeysphere.git diff --git a/src/common b/src/common index 40ba8de..c8a7db6 100644 --- a/src/common +++ b/src/common @@ -98,7 +98,7 @@ cutline() { lock() { local use_lockfileprogs=true local action="$1" - local file="$file" + local file="$2" if ! ( which lockfile-create >/dev/null 2>/dev/null ) ; then if ! ( which lockfile >/dev/null ); then @@ -132,7 +132,7 @@ lock() { *) failure "bad argument for lock subfunction '$action'" esac - +} # check that characters are in a string (in an AND fashion). # used for checking key capability @@ -726,7 +726,7 @@ process_host_known_hosts() { if [ "$HASH_KNOWN_HOSTS" = 'true' ] ; then # FIXME: this is really hackish cause ssh-keygen won't # hash from stdin to stdout - tmpfile=$(mktemp) + tmpfile=$(mktemp ${TMPDIR:-/tmp}/tmp.XXXXXXXXXX) ssh2known_hosts "$host" "$sshKey" > "$tmpfile" ssh-keygen -H -f "$tmpfile" 2> /dev/null cat "$tmpfile" >> "$KNOWN_HOSTS"