X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=blobdiff_plain;ds=sidebyside;f=bsmtp-pull;h=600763d58e4540b7cd1c6f2ee912aea9fbd3cbd1;hb=a542a487167aada858784adf9f5e1d5884da3d18;hp=5a2c474c6c68fc09bdf879bda76c08221888eae8;hpb=f65a1cbceaa3ab471e5d9fa87f5637559e3b581d;p=bin.git

diff --git a/bsmtp-pull b/bsmtp-pull
index 5a2c474..600763d 100755
--- a/bsmtp-pull
+++ b/bsmtp-pull
@@ -7,7 +7,7 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-DIR="$HOME/.bsmtp"
+DIR="$HOME/tmp/.bsmtp"
 mkdir -p "$DIR"
 cd "$DIR"
 
@@ -19,11 +19,13 @@ HOST="$1"
 # By default, lockfile-create gives up after three minutes, so don't cron
 # this any more frequently than that without supplying a --retry argument.
 lockfile-create "$HOST"
+# Race condition pointed out by pjb: this doesn't guarantee that the lock is
+# held before the critical section starts.
 lockfile-touch "$HOST" &
 TOUCH="$!"
 trap 'kill "$TOUCH"; lockfile-remove "$HOST"' EXIT ERR HUP INT QUIT TERM
 
-ssh -2 -C "$HOST" bsmtp-pull-server > "$HOST"
+ssh -2 -i "$HOME/.ssh/id-bsmtp-$HOST" -C "$HOST" bsmtp-pull-server > "$HOST"
 [ -s "$HOST" ] || exit 0
 /usr/sbin/sendmail -bS < "$HOST"
 rm -f "$HOST"