diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/exim.c | 6 | ||||
| -rw-r--r-- | src/src/functions.h | 3 | ||||
| -rw-r--r-- | src/src/malware.c | 5 |
4 files changed, 13 insertions, 5 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 8c88085f8..f5fbbd639 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.626 2010/06/06 02:46:13 pdp Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.627 2010/06/06 22:46:33 pdp Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -42,6 +42,8 @@ PP/12 Bugzilla 973: Implement --version. PP/13 Bugzilla 752: Refuse to build/run if Exim user is root/0. +PP/14 Build without WITH_CONTENT_SCAN. Path from Andreas Metzler. + Exim version 4.72 ----------------- diff --git a/src/src/exim.c b/src/src/exim.c index a68a06227..890bcebe9 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/exim.c,v 1.69 2010/06/06 02:46:13 pdp Exp $ */ +/* $Cambridge: exim/src/src/exim.c,v 1.70 2010/06/06 22:46:34 pdp Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -3623,6 +3623,7 @@ else setgid(exim_gid); /* Handle a request to scan a file for malware */ if (malware_test_file) { +#ifdef WITH_CONTENT_SCAN int result; set_process_info("scanning file for malware"); result = malware_in_file(malware_test_file); @@ -3640,6 +3641,9 @@ if (malware_test_file) printf("Malware found: %s\n", malware_name); else printf("Malware scan detected malware of unknown name.\n"); +#else + printf("Malware scanning not enabled at compile time.\n"); +#endif exit(EXIT_FAILURE); } diff --git a/src/src/functions.h b/src/src/functions.h index 90c2b1269..24088727a 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/functions.h,v 1.51 2010/06/06 00:27:52 pdp Exp $ */ +/* $Cambridge: exim/src/src/functions.h,v 1.52 2010/06/06 22:46:34 pdp Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -156,6 +156,7 @@ extern void log_close_all(void); #ifdef WITH_CONTENT_SCAN extern int malware(uschar **); +extern int malware_in_file(uschar *); #endif extern int match_address_list(uschar *, BOOL, BOOL, uschar **, unsigned int *, int, int, uschar **); diff --git a/src/src/malware.c b/src/src/malware.c index 5ee52eb84..61b0c2994 100644 --- a/src/src/malware.c +++ b/src/src/malware.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/malware.c,v 1.19 2010/06/05 11:13:30 pdp Exp $ */ +/* $Cambridge: exim/src/src/malware.c,v 1.20 2010/06/06 22:46:34 pdp Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -100,7 +100,8 @@ Arguments: Returns: Exim message processing code (OK, FAIL, DEFER, ...) where true means malware was found (condition applies) */ -int malware_in_file(uschar *eml_filename) { +int +malware_in_file(uschar *eml_filename) { uschar *scan_options[2]; uschar message_id_buf[64]; int ret; |