bsmtp-pull: drop -2; avoid connection sharing

[bin.git] / bsmtp-pull

diff --git a/bsmtp-pull b/bsmtp-pull
index 439bee284fc258cb84f0f6c2a85f189e30e28569..cd51d6872ac1fd4e3ae0adf6b365a234f986ae2b 100755 (executable)
--- a/bsmtp-pull
+++ b/bsmtp-pull
@@ -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 -odq < "$HOST"
+/usr/sbin/sendmail -bS -odb < "$HOST"
 rm -f "$HOST"
 
 exit 0