Fix bug in malware scanner options

Fix more string types

diff --git a/src/src/malware.c b/src/src/malware.c
index 73df68a579748d9fb4a372a66a93faa7922fd447..15d6a6ff8037d5f28bf2b461779318e3fa921ac6 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -157,7 +157,7 @@ malware_errlog_defer(const uschar * str)
 }
 
 static int
-m_scanner_errlog_defer(const char * scanner, const uschar * str)
+m_scanner_errlog_defer(const uschar * scanner, const uschar * str)
 {
   return malware_errlog_defer(string_sprintf("%s: %s", scanner, str));
 }
@@ -165,56 +165,56 @@ m_scanner_errlog_defer(const char * scanner, const uschar * str)
 static int
 fprotd_errlog_defer(const uschar * str)
 {
-  return m_scanner_errlog_defer("f-protd", str);
+  return m_scanner_errlog_defer(US"f-protd", str);
 }
 static int
 drweb_errlog_defer(const uschar * str, int fd_to_close)
 {
   (void) close(fd_to_close);
-  return m_scanner_errlog_defer("drweb", str);
+  return m_scanner_errlog_defer(US"drweb", str);
 }
 static int
 aves_errlog_defer(const uschar * str)
 {
-  return m_scanner_errlog_defer("aveserver", str);
+  return m_scanner_errlog_defer(US"aveserver", str);
 }
 static int
 fsec_errlog_defer(const uschar * str)
 {
-  return m_scanner_errlog_defer("fsecure", str);
+  return m_scanner_errlog_defer(US"fsecure", str);
 }
 static int
 kavd_errlog_defer(const uschar * str, int fd_to_close)
 {
   if (fd_to_close >= 0) (void) close(fd_to_close);
-  return m_scanner_errlog_defer("kavdaemon", str);
+  return m_scanner_errlog_defer(US"kavdaemon", str);
 }
 static int
 cmdl_errlog_defer(const uschar * str)
 {
-  return m_scanner_errlog_defer("commandline", str);
+  return m_scanner_errlog_defer(US"commandline", str);
 }
 static int
 soph_errlog_defer(const uschar * str, int fd_to_close)
 {
   (void) close(fd_to_close);
-  return m_scanner_errlog_defer("sophie", str);
+  return m_scanner_errlog_defer(US"sophie", str);
 }
 static int
 clmd_errlog_defer(const uschar * str)
 {
-  return m_scanner_errlog_defer("clamd", str);
+  return m_scanner_errlog_defer(US"clamd", str);
 }
 static int
 mksd_errlog_defer(const uschar * str)
 {
-  return m_scanner_errlog_defer("mksd", str);
+  return m_scanner_errlog_defer(US"mksd", str);
 }
 static int
 sock_errlog_defer(const uschar * str, int fd_to_close)
 {
   if (fd_to_close >= 0) (void) close(fd_to_close);
-  return m_scanner_errlog_defer("sock", str);
+  return m_scanner_errlog_defer(US"sock", str);
 }
 
 static void
@@ -451,10 +451,10 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
          scanner_name));
       if (strcmpic(scanner_name, US scanent->name) != 0)
        continue;
-      if (scanent->conn == MC_NONE)
-       break;
       if (!(scanner_options = string_nextinlist(&av_scanner_work, &sep, NULL, 0)))
        scanner_options = scanent->options_default;
+      if (scanent->conn == MC_NONE)
+       break;
       switch(scanent->conn)
       {
       case MC_TCP:  sock = m_tcpsocket_fromdef(scanner_options, &errstr); break;