X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e8793bad207763b266bedcb9d859e238b6a3a04e..2381c830c6f89e3abc2dc153d483251a4403e71f:/src/src/malware.c

diff --git a/src/src/malware.c b/src/src/malware.c
index 01209d684..cae0cdd99 100644
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2013 */
+/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-2014 */
 /* License: GPL */
 
 /* Code for calling virus (malware) scanners. Called from acl.c. */
@@ -401,11 +401,13 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
       case MC_TCP:  sock = m_tcpsocket_fromdef(scanner_options, &errstr); break;
       case MC_UNIX: sock = m_unixsocket(scanner_options, &errstr);	  break;
       case MC_STRM: sock = m_streamsocket(scanner_options, &errstr);	  break;
+      default: /* compiler quietening */ break;
       }
       if (sock < 0)
 	return m_errlog_defer(scanent, errstr);
       break;
     }
+    DEBUG(D_lookup) debug_printf("Malware scan: %s\n", scanner_name);
 
     switch (scanent->scancode) {
     case M_FPROTD: /* "f-protd" scanner type -------------------------------- */
@@ -943,12 +945,10 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
 	sep = pclose(scanner_out);
 	signal(SIGCHLD,eximsigchld); signal(SIGPIPE,eximsigpipe);
 	if (sep != 0)
-	  if (sep == -1)
 	    return m_errlog_defer(scanent,
-	      string_sprintf("running scanner failed: %s", strerror(sep)));
-	  else
-	    return m_errlog_defer(scanent,
-	      string_sprintf("scanner returned error code: %d", sep));
+		sep == -1
+		? string_sprintf("running scanner failed: %s", strerror(sep))
+		: string_sprintf("scanner returned error code: %d", sep));
 
 	if (trigger) {
 	  uschar * s;
@@ -1269,8 +1269,7 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
 	    {
 	    free(clamav_fbuf);
 	    return m_errlog_defer_3(scanent,
-	      string_sprintf("unable to send file body to socket (%s:%u)",
-		hostname, port),
+	      string_sprintf("unable to send file body to socket (%s)", hostname),
 	      sock);
 	    }
   #endif