diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-10-10 11:20:56 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-10-10 11:20:56 +0100 |
| commit | 0fdd8204644a6ae3daa310b3f5906b5c8b8ea0b4 (patch) | |
| tree | 8a8872843875552cb1f43b9c98901768d87ad6ad | |
| parent | 7dd249088ba72730d8c05a38e02a56f82ff3fe92 (diff) | |
FreeBSD: fix sendfile shim
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/OS/os.c-FreeBSD | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 6d78cd320..4e0d602dd 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -18,6 +18,9 @@ JH/03 Constification work in the filters module required a major version global which is visible via the API is now const and may therefore not be modified by local-scan code. +JH/04 Fix ClamAV TCP use under FreeBSD. Previously the OS-specific shim for + sendfile() didi not account for the way the ClamAV driver code called it. + Exim version 4.95 ----------------- diff --git a/src/OS/os.c-FreeBSD b/src/OS/os.c-FreeBSD index cb0b0bf7f..38df91cf4 100644 --- a/src/OS/os.c-FreeBSD +++ b/src/OS/os.c-FreeBSD @@ -19,7 +19,7 @@ os_sendfile(int out, int in, off_t * offp, size_t cnt) off_t loff = *offp, written; if (sendfile(in, out, loff, cnt, NULL, &written, 0) < 0) return (ssize_t)-1; -*offp = loff + written; +if (offp) *offp = loff + written; return (ssize_t)written; } |