X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=blobdiff_plain;f=bsmtp-pull;h=cd51d6872ac1fd4e3ae0adf6b365a234f986ae2b;hb=HEAD;hp=600763d58e4540b7cd1c6f2ee912aea9fbd3cbd1;hpb=a542a487167aada858784adf9f5e1d5884da3d18;p=bin.git

diff --git a/bsmtp-pull b/bsmtp-pull
index 600763d..cd51d68 100755
--- a/bsmtp-pull
+++ b/bsmtp-pull
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 # Depends: lockfile-progs, ssh
 set -e
 
@@ -24,10 +24,14 @@ lockfile-create "$HOST"
 lockfile-touch "$HOST" &
 TOUCH="$!"
 trap 'kill "$TOUCH"; lockfile-remove "$HOST"' EXIT ERR HUP INT QUIT TERM
+disown %1
 
-ssh -2 -i "$HOME/.ssh/id-bsmtp-$HOST" -C "$HOST" bsmtp-pull-server > "$HOST"
+ssh -S none -i "$HOME/.ssh/id-bsmtp-$HOST" -C "$HOST" bsmtp-pull-server > "$HOST"
+if [ "$BSMTP_PULL_DEBUG" ]; then
+	ls -l "$HOST" || true
+fi
 [ -s "$HOST" ] || exit 0
-/usr/sbin/sendmail -bS < "$HOST"
+/usr/sbin/sendmail -bS -odb < "$HOST"
 rm -f "$HOST"
 
 exit 0