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
OpenSSL: More info on accept "unsupported protocol"
[exim.git]
/
src
/
src
/
malware.c
diff --git
a/src/src/malware.c
b/src/src/malware.c
index ec2f7c1cfc7681eac5e9a1d34acbb15895bde805..afe9e00028d3903ea8e70614b29347e121f6fad6 100644
(file)
--- a/
src/src/malware.c
+++ b/
src/src/malware.c
@@
-654,11
+654,11
@@
if (!malware_ok)
switch(scanent->conn)
{
case MC_TCP:
switch(scanent->conn)
{
case MC_TCP:
- malware_daemon_ctx.sock = ip_tcpsocket(scanner_options, &errstr, 5
);
break;
+ malware_daemon_ctx.sock = ip_tcpsocket(scanner_options, &errstr, 5
, NULL);
break;
case MC_UNIX:
malware_daemon_ctx.sock = ip_unixsocket(scanner_options, &errstr); break;
case MC_STRM:
case MC_UNIX:
malware_daemon_ctx.sock = ip_unixsocket(scanner_options, &errstr); break;
case MC_STRM:
- malware_daemon_ctx.sock = ip_streamsocket(scanner_options, &errstr, 5
);
break;
+ malware_daemon_ctx.sock = ip_streamsocket(scanner_options, &errstr, 5
, NULL);
break;
default:
/* compiler quietening */ break;
}
default:
/* compiler quietening */ break;
}
@@
-791,7
+791,7
@@
if (!malware_ok)
if (*scanner_options != '/')
{
/* calc file size */
if (*scanner_options != '/')
{
/* calc file size */
- if ((drweb_fd = exim_open(CCS eml_filename, O_RDONLY)) == -1)
+ if ((drweb_fd = exim_open
2
(CCS eml_filename, O_RDONLY)) == -1)
return m_panic_defer_3(scanent, NULL,
string_sprintf("can't open spool file %s: %s",
eml_filename, strerror(errno)),
return m_panic_defer_3(scanent, NULL,
string_sprintf("can't open spool file %s: %s",
eml_filename, strerror(errno)),
@@
-2276,12
+2276,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");
}
}