chiark
/
gitweb
/
~cjwatson
/
bin.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bugzilla-show: use HTTPS; drop warthogs and ubuntu
[bin.git]
/
bsmtp-pull
diff --git
a/bsmtp-pull
b/bsmtp-pull
index ebaee7ed7a652a2962456ab9756e907e40757cae..cd51d6872ac1fd4e3ae0adf6b365a234f986ae2b 100755
(executable)
--- a/
bsmtp-pull
+++ b/
bsmtp-pull
@@
-26,9
+26,12
@@
TOUCH="$!"
trap 'kill "$TOUCH"; lockfile-remove "$HOST"' EXIT ERR HUP INT QUIT TERM
disown %1
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
[ -s "$HOST" ] || exit 0
-/usr/sbin/sendmail -bS -od
q
< "$HOST"
+/usr/sbin/sendmail -bS -od
b
< "$HOST"
rm -f "$HOST"
exit 0
rm -f "$HOST"
exit 0