X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fcommon;h=c8a7db65425523a59d84ec7aab094e384db96100;hb=85b105c27fb67921199d282dc90d612c9b525bee;hp=25f7e4efc245fa7b95cb39ca946a1e50ab8fef23;hpb=74bd3557fe340555629fd8615c31fe4b6a8b8174;p=monkeysphere.git diff --git a/src/common b/src/common index 25f7e4e..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 @@ -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"