git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix debug_print_socket()
[exim.git]
/
src
/
src
/
malware.c
diff --git
a/src/src/malware.c
b/src/src/malware.c
index a4080d0407d06dc14edaa48e41f2620dbef518fb..7ed4d358d983db82c30c7efd0d9f1c89c67f8f27 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) Tom Kistner <tom@duncanthrax.net> 2003 - 2015
* License: GPL
- * Copyright (c) The Exim Maintainers 2015 - 20
18
+ * Copyright (c) The Exim Maintainers 2015 - 20
20
*/
/* Code for calling virus (malware) scanners. Called from acl.c. */
*/
/* Code for calling virus (malware) scanners. Called from acl.c. */
@@
-262,6
+262,7
@@
static inline int
m_panic_defer_3(struct scan * scanent, const uschar * hostport,
const uschar * str, int fd_to_close)
{
m_panic_defer_3(struct scan * scanent, const uschar * hostport,
const uschar * str, int fd_to_close)
{
+DEBUG(D_acl) debug_print_socket(fd_to_close);
(void) close(fd_to_close);
return m_panic_defer(scanent, hostport, str);
}
(void) close(fd_to_close);
return m_panic_defer(scanent, hostport, str);
}
@@
-338,6
+339,7
@@
else
return cre;
}
return cre;
}
+
/*
Simple though inefficient wrapper for reading a line. Drop CRs and the
trailing newline. Can return early on buffer full. Null-terminate.
/*
Simple though inefficient wrapper for reading a line. Drop CRs and the
trailing newline. Can return early on buffer full. Null-terminate.
@@
-369,8
+371,12
@@
while ((rcv = read(fd, p, 1)) > 0)
}
if (!ok)
{
}
if (!ok)
{
- DEBUG(D_acl) debug_printf_indent("Malware scan: read %s (%s)\n",
+ DEBUG(D_acl)
+ {
+ debug_printf_indent("Malware scan: read %s (%s)\n",
rcv==0 ? "EOF" : "error", strerror(errno));
rcv==0 ? "EOF" : "error", strerror(errno));
+ debug_print_socket(fd);
+ }
return rcv==0 ? -1 : -2;
}
*p = '\0';
return rcv==0 ? -1 : -2;
}
*p = '\0';
@@
-2276,12
+2282,13
@@
if (!fprot6d_re_virus)
}
}
-void
-malware_show_supported(
FILE * f
)
+gstring *
+malware_show_supported(
gstring * g
)
{
{
-fprintf(f, "Malware:");
-for (struct scan * sc = m_scans; sc->scancode != (scanner_t)-1; sc++) fprintf(f, " %s", sc->name);
-fprintf(f, "\n");
+g = string_cat(g, US"Malware:");
+for (struct scan * sc = m_scans; sc->scancode != (scanner_t)-1; sc++)
+ g = string_fmt_append(g, " %s", sc->name);
+return string_cat(g, US"\n");
}
}