summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-04-26 15:28:22 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2017-04-26 20:27:10 +0100
commiteeb35890a1eefbdf6bd8fcb86fcc31233835b0df (patch)
treed621ed004758bec2c9ded25b18af8be1749f8db3 /src
parent5ea5d64c99a3f99722034f11d7bf79ab9d10f014 (diff)
Enable use of sendfile
Diffstat (limited to 'src')
-rw-r--r--src/OS/os.h-Linux5
-rw-r--r--src/src/dkim_transport.c2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/OS/os.h-Linux b/src/OS/os.h-Linux
index cc1cef99b..3e9303cab 100644
--- a/src/OS/os.h-Linux
+++ b/src/OS/os.h-Linux
@@ -18,9 +18,10 @@ with the issue. */
/* When using the DKIM, setting HAVE_LINUX_SENDFILE can increase
performance on outgoing mail a bit. Note: With older glibc versions
this setting will conflict with the _FILE_OFFSET_BITS=64 setting
-defined as part of the Linux CFLAGS. */
+defined as part of the Linux CFLAGS. As of 2017 those are declared
+to be too old to build by default. */
-/* #define HAVE_LINUX_SENDFILE */
+#define HAVE_LINUX_SENDFILE
#define F_FREESP O_TRUNC
typedef struct flock flock_t;
diff --git a/src/src/dkim_transport.c b/src/src/dkim_transport.c
index 552e1beb1..2aba56054 100644
--- a/src/src/dkim_transport.c
+++ b/src/src/dkim_transport.c
@@ -58,7 +58,7 @@ if (tls_out.active != out_fd)
ssize_t copied = 0;
while(copied >= 0 && off < size)
- copied = sendfile(tctx->u.fd, dkim_fd, &off, size - off);
+ copied = sendfile(out_fd, in_fd, &off, size - off);
if (copied < 0)
return FALSE;
}