Fix client-only use of gsasl authenticator. Bug 2818

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

diff --git a/src/src/malware.c b/src/src/malware.c
index cd80cd4b2d01dc620867f0ab2849aa9268ad4ecf..1dc89ae1509c680b0f8cadb3676c47bcaefbe5f4 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 2015 - 2020
+ * Copyright (c) The Exim Maintainers 2015 - 2021
  */
 
 /* Code for calling virus (malware) scanners. Called from acl.c. */
@@ -313,7 +313,7 @@ if (!(cre = pcre2_compile((PCRE2_SPTR)re, PCRE2_ZERO_TERMINATED,
   {
   uschar errbuf[128];
   pcre2_get_error_message(err, errbuf, sizeof(errbuf));
-  *errstr= string_sprintf("regular expression error in '%s': %s at offset %l",
+  *errstr= string_sprintf("regular expression error in '%s': %s at offset %ld",
       re, errbuf, (long)roffset);
   }
 return cre;
@@ -1563,7 +1563,11 @@ badseek:  err = errno;
       if (!use_scan_command)
        { cmd_str.data = US"zINSTREAM"; cmd_str.len = 10; }
       else
-       cmd_str.data = string_sprintf("SCAN %s\n%n", eml_filename, &cmd_str.len);
+       {
+       int n;
+       cmd_str.data = string_sprintf("SCAN %s\n%n", eml_filename, &n);
+       cmd_str.len = n;                /* .len is a size_t */
+       }
 
       /* We have some network servers specified */
       if (num_servers)
@@ -1820,7 +1824,7 @@ badseek:  err = errno;
       if (*p) ++p;
 
       /* colon in returned output? */
-      if(!(p = Ustrchr(av_buffer,':')))
+      if (!(p = Ustrchr(av_buffer,':')))
        return m_panic_defer(scanent, CUS callout_address, string_sprintf(
                  "ClamAV returned malformed result (missing colon): %s",
                  av_buffer));