1. clamav-devel
  2. Commit b696653a1f6f86b95a45e85c7f6d15b833ea3088
Browse code

Use the location of sendmail discovered by configure

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@147 77e5149b-7576-45b1-b177-96237e5ba77b

Nigel Horne authored on 2003/12/09 18:23:20
Showing 3 changed files
ChangeLog
History View file @ b696653
... ... 
@@ -1,3 +1,7 @@
1 
+Tue Dec  9 09:22:46 GMT 2003 (njh)
2 
+----------------------------------
3 
+  * clamav-milter: Use the location of sendmail discovered by configure
4 
+
1 5 
 Mon Dec  8 19:51:23 CET 2003 (tk)
2 6 
 ---------------------------------
3 7 
   * configure: locate the sendmail executable
clamav-milter/INSTALL
History View file @ b696653
... ... 
@@ -172,6 +172,7 @@ Changes
172 172 
 		clamd will think it is an mbox and not handle
173 173 
 		unescaped From at the start of lines properly
174 174 
 		Thanks to Michael Dankov <misha@btrc.ru>
175 
+0.65i	9/12/03	Use the location of sendmail discovered by configure
175 176
176 177 
 BUG REPORTS
177 178
clamav-milter/clamav-milter.c
History View file @ b696653
... ... 
@@ -175,9 +175,13 @@
175 175 
  *			clamd will think it is an mbox and not handle
176 176 
  *			unescaped From at the start of lines properly
177 177 
  *			Thanks to Michael Dankov <misha@btrc.ru>
178 
+ *	0.65i	9/12/03	Use the location of sendmail discovered by configure
178 179 
  *
179 180 
  * Change History:
180 181 
  * $Log: clamav-milter.c,v $
182 
+ * Revision 1.28  2003/12/09 09:22:14  nigelhorne
183 
+ * Use the location of sendmail discovered by configure
184 
+ *
181 185 
  * Revision 1.27  2003/12/05 19:14:07  nigelhorne
182 186 
  * Set umask; handle unescaped From in mailboxes
183 187 
  *
... ... 
@@ -244,9 +248,9 @@
244 244 
  * Revision 1.6  2003/09/28 16:37:23  nigelhorne
245 245 
  * Added -f flag use MaxThreads if --max-children not set
246 246 
  */
247 
-static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.27 2003/12/05 19:14:07 nigelhorne Exp $";
247 
+static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.28 2003/12/09 09:22:14 nigelhorne Exp $";
248 248
249 
-#define	CM_VERSION	"0.65h"
249 
+#define	CM_VERSION	"0.65i"
250 250
251 251 
 /*#define	CONFDIR	"/usr/local/etc"*/
252 252
... ... 
@@ -289,6 +293,10 @@ static	char	const	rcsid[] = "$Id: clamav-milter.c,v 1.27 2003/12/05 19:14:07 nig
289 289 
 #define _GNU_SOURCE
290 290 
 #include "getopt.h"
291 291
292 
+#ifndef	SENDMAIL_BIN
293 
+#define	SENDMAIL_BIN	"/usr/lib/sendmail"
294 
+#endif
295 
+
292 296 
 /*
293 297 
  * TODO: optional: xmessage on console when virus stopped (SNMP would be real nice!)
294 298 
  *	Having said that, with LogSysLog you can (on Linux) configure the system
... ... 
@@ -1467,7 +1475,12 @@ clamfi_eom(SMFICTX *ctx)
1467 1467 
 		free(err);
1468 1468
1469 1469 
 		if(!qflag) {
1470 
-			sendmail = popen("/usr/lib/sendmail -t", "w");
1470 
+			char cmd[128];
1471 
+
1472 
+			snprintf(cmd, sizeof(cmd), "%s -t", SENDMAIL_BIN);
1473 
+
1474 
+			sendmail = popen(cmd, "w");
1475 
+
1471 1476 
 			if(sendmail) {
1472 1477 
 				/*
1473 1478 
 				 * TODO: Make this e-mail message customisable