aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2007-03-29 22:52:16 +0000
committerMatthias Andree <matthias.andree@gmx.de>2007-03-29 22:52:16 +0000
commitc4874db8029ee0296c9324ec2360317ec0e379b7 (patch)
treec3b3df898d028ff114a4a9fe069a6d786b4b999f
parent0429d4e16b5db4e59f1fa926416e346c6e879ca5 (diff)
downloadfetchmail-c4874db8029ee0296c9324ec2360317ec0e379b7.tar.gz
fetchmail-c4874db8029ee0296c9324ec2360317ec0e379b7.tar.bz2
fetchmail-c4874db8029ee0296c9324ec2360317ec0e379b7.zip
Make BSMTP output actually work, it would persistently fail with SOCKET error
after writing the first header. svn path=/branches/BRANCH_6-3/; revision=5071
-rw-r--r--NEWS2
-rw-r--r--sink.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 1b79f5e5..b31673bf 100644
--- a/NEWS
+++ b/NEWS
@@ -77,6 +77,8 @@ fetchmail 6.3.8 (not yet released):
* Do not crash with a null pointer dereference when opening the BSMTP file
fails. Improve error checking and reporting. Reported by Reto Schüttel,
Debian Bug#416625. Fix based on a patch by Nico Golde.
+* Make BSMTP output actually work, it would persistently fail with SOCKET error
+ after writing the first header.
# DOCUMENTATION:
* Extend --mda documentation, discourage use of qmail-inject.
diff --git a/sink.c b/sink.c
index 22d2243a..9dd9ce70 100644
--- a/sink.c
+++ b/sink.c
@@ -686,7 +686,7 @@ int stuffline(struct query *ctl, char *buf)
n = 0;
if (ctl->mda || ctl->bsmtp) {
- n = fwrite(buf, last - buf, 1, sinkfp);
+ n = fwrite(buf, 1, last - buf, sinkfp);
if (ferror(sinkfp)) n = -1;
} else if (ctl->smtp_socket != -1)
n = SockWrite(ctl->smtp_socket, buf, last - buf);