pdp 2010/06/06 23:46:34 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exim.c functions.h malware.c
Log:
Build without WITH_CONTENT_SCAN.
Broken by -bmalware option added while reworking ClamAV to new API.
Path from Andreas Metzler (adjusted slightly).
Revision Changes Path
1.627 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.70 +4 -0 exim/exim-src/src/exim.c
1.52 +1 -0 exim/exim-src/src/functions.h
1.20 +2 -1 exim/exim-src/src/malware.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.626
retrieving revision 1.627
diff -u -r1.626 -r1.627
--- ChangeLog 6 Jun 2010 02:46:13 -0000 1.626
+++ ChangeLog 6 Jun 2010 22:46:33 -0000 1.627
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.626 2010/06/06 02:46:13 pdp Exp $
+$Cambridge: exim/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/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
-----------------
Index: exim.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- exim.c 6 Jun 2010 02:46:13 -0000 1.69
+++ exim.c 6 Jun 2010 22:46:34 -0000 1.70
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.c,v 1.69 2010/06/06 02:46:13 pdp Exp $ */
+/* $Cambridge: exim/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 @@
/* 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 @@
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);
}
Index: functions.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/functions.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- functions.h 6 Jun 2010 00:27:52 -0000 1.51
+++ functions.h 6 Jun 2010 22:46:34 -0000 1.52
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/functions.h,v 1.51 2010/06/06 00:27:52 pdp Exp $ */
+/* $Cambridge: exim/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 @@
#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 **);
Index: malware.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/malware.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- malware.c 5 Jun 2010 11:13:30 -0000 1.19
+++ malware.c 6 Jun 2010 22:46:34 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/malware.c,v 1.19 2010/06/05 11:13:30 pdp Exp $ */
+/* $Cambridge: exim/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 @@
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;
