Browse code

Fix to bug 267

git-svn: trunk@2817

Nigel Horne authored on 2007/02/20 07:50:51
Showing 3 changed files
... ...
@@ -38,6 +38,11 @@ Sat Feb 17 01:31:45 CET 2007 (acab)
38 38
 -----------------------------------
39 39
   * libclamav/regex_list.c: Close #303 - patch from Edvin
40 40
 
41
+Fri Feb 16 12:29:51 GMT 2007 (njh)
42
+----------------------------------
43
+  * libclamav/clamav-milter.c:	Added support for sendmail 8.14, bug 267,
44
+			patch from Andy Fiddaman <clam fiddaman.net>
45
+
41 46
 Thu Feb 15 16:34:48 CET 2007 (tk)
42 47
 ---------------------------------
43 48
   * libclamav/rtf.c: add more sanity checks (Edwin)
... ...
@@ -49,11 +54,11 @@ Thu Feb 15 16:18:53 CET 2007 (tk)
49 49
 Thu Feb 15 12:27:22 GMT 2007 (njh)
50 50
 ----------------------------------
51 51
   * libclamav/mbox.c:	Fixed bugs in the handling of boundary lines
52
-  			Improved handling of the warning messages associated
52
+			Improved handling of the warning messages associated
53 53
 				with recursion limits
54 54
 			Fixed handling of OK_ATTACHMENTS_NOT_SAVED in some
55 55
 				larger files
56
-  			
56
+
57 57
 Wed Feb 14 13:15:25 CET 2007 (tk)
58 58
 ---------------------------------
59 59
   * libclamav/entconv.c: fix incorrect use of isspace() in experimental code
... ...
@@ -71,7 +71,7 @@ doesn't include libmilter so you can't develop milter applications on it.
71 71
 Go to sendmail.org, download the latest sendmail, cd to libmilter and
72 72
 "make install" there.
73 73
 
74
-Needs -lresolv on Solaris
74
+Needs -lresolv on Solaris, for res_close().
75 75
 
76 76
 If, when building clamav-milter, you see the error
77 77
 	"undefined reference to smfi_opensocket",
... ...
@@ -608,6 +608,11 @@ main(int argc, char **argv)
608 608
 #ifndef	CL_DEBUG
609 609
 	int consolefd;
610 610
 #endif
611
+	/*
612
+	 * The SMFI_VERSION checks are for Sendmail 8.14, which I don't have
613
+	 * yet, so I can't verify them
614
+	 * Patch from Andy Fiddaman <clam@fiddaman.net>
615
+	 */
611 616
 	struct smfiDesc smfilter = {
612 617
 		"ClamAv", /* filter name */
613 618
 		SMFI_VERSION,	/* version code -- leave untouched */
... ...
@@ -626,6 +631,15 @@ main(int argc, char **argv)
626 626
 		clamfi_eom,	/* end of message callback */
627 627
 		clamfi_abort,	/* message aborted callback */
628 628
 		clamfi_close,	/* connection cleanup callback */
629
+#if	SMFI_VERSION > 2
630
+		NULL,		/* Unrecognised command */
631
+#endif
632
+#if	SMFI_VERSION > 3
633
+		NULL,		/* DATA command callback */
634
+#endif
635
+#if	SMFI_VERSION >= 0x01000000
636
+		NULL,		/* Negotiation callback */
637
+#endif
629 638
 	};
630 639
 
631 640
 #if defined(CL_DEBUG) && defined(C_LINUX)