Merge branch 'master' into 4.next

[exim.git] / src / src / malware.c

diff --git a/src/src/malware.c b/src/src/malware.c
index ccb7e6d2043f152c784f9ab29773091b40e93508..9a98c99578c1b499c79d79fd77096ae3063eb9b6 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -4,7 +4,7 @@
 
 /* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
  * License: GPL
- * Copyright (c) The Exim Maintainers 2016
+ * Copyright (c) The Exim Maintainers 2017
  */
 
 /* Code for calling virus (malware) scanners. Called from acl.c. */
@@ -147,10 +147,10 @@ uses the returned in_addr to get a second connection to the same system.
 */
 static inline int
 m_tcpsocket(const uschar * hostname, unsigned int port,
-       host_item * host, uschar ** errstr, const blob * fastopen)
+       host_item * host, uschar ** errstr, const blob * fastopen_blob)
 {
 return ip_connectedsocket(SOCK_STREAM, hostname, port, port, 5,
-                         host, errstr, fastopen);
+                         host, errstr, fastopen_blob);
 }
 
 static int