|
|
|
|
Index: clamav-milter/clamav-milter.c
|
|
|
|
|
--- clamav-milter/clamav-milter.c.orig 2007-07-16 22:11:19 +0200
|
|
|
|
|
+++ clamav-milter/clamav-milter.c 2007-08-08 16:07:47 +0200
|
|
|
|
|
@@ -411,6 +411,10 @@
|
|
|
|
|
* Send a 550 rejection when a virus is
|
|
|
|
|
* found
|
|
|
|
|
*/
|
|
|
|
|
+static int nosubject = 0; /*
|
|
|
|
|
+ * Do not change the Subject header
|
|
|
|
|
+ * in case a virus is found.
|
|
|
|
|
+ */
|
|
|
|
|
static int hflag = 0; /*
|
|
|
|
|
* Include original message headers in
|
|
|
|
|
* report
|
|
|
|
|
@@ -598,6 +602,7 @@
|
|
|
|
|
puts(_("\t--max-childen\t\t-m\tMaximum number of concurrent scans."));
|
|
|
|
|
puts(_("\t--outgoing\t\t-o\tScan outgoing messages from this machine."));
|
|
|
|
|
puts(_("\t--noreject\t\t-N\tDon't reject viruses, silently throw them away."));
|
|
|
|
|
+ puts(_("\t--nosubject\t\t-N\tDon't change Subject header."));
|
|
|
|
|
puts(_("\t--noxheader\t\t-n\tSuppress X-Virus-Scanned/X-Virus-Status headers."));
|
|
|
|
|
puts(_("\t--pidfile=FILE\t\t-i FILE\tLocation of pidfile."));
|
|
|
|
|
puts(_("\t--postmaster\t\t-p EMAIL\tPostmaster address [default=postmaster]."));
|
|
|
|
|
@@ -778,6 +783,9 @@
|
|
|
|
|
"noreject", 0, NULL, 'N'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
+ "nosubject", 0, NULL, 'Z'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
"noxheader", 0, NULL, 'n'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
@@ -946,6 +954,9 @@
|
|
|
|
|
case 'N': /* Do we reject mail or silently drop it */
|
|
|
|
|
rejectmail = 0;
|
|
|
|
|
break;
|
|
|
|
|
+ case 'Z':
|
|
|
|
|
+ nosubject = 1;
|
|
|
|
|
+ break;
|
|
|
|
|
case 'o': /* scan outgoing mail */
|
|
|
|
|
oflag++;
|
|
|
|
|
break;
|
|
|
|
|
@@ -1045,11 +1056,13 @@
|
|
|
|
|
}
|
|
|
|
|
port = argv[optind];
|
|
|
|
|
|
|
|
|
|
+#if 0
|
|
|
|
|
if(rootdir == NULL) /* FIXME: Handle CHROOT */
|
|
|
|
|
if(verifyIncomingSocketName(port) < 0) {
|
|
|
|
|
fprintf(stderr, _("%s: socket-addr (%s) doesn't agree with sendmail.cf\n"), argv[0], port);
|
|
|
|
|
return EX_CONFIG;
|
|
|
|
|
}
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
if(strncasecmp(port, "inet:", 5) == 0)
|
|
|
|
|
if(!lflag) {
|
|
|
|
|
@@ -4934,6 +4947,7 @@
|
|
|
|
|
struct privdata *privdata = (struct privdata *)smfi_getpriv(ctx);
|
|
|
|
|
char subject[128];
|
|
|
|
|
|
|
|
|
|
+ if (!nosubject) {
|
|
|
|
|
if(privdata->subject)
|
|
|
|
|
smfi_addheader(ctx, "X-Original-Subject", privdata->subject);
|
|
|
|
|
|
|
|
|
|
@@ -4942,6 +4956,7 @@
|
|
|
|
|
smfi_chgheader(ctx, "Subject", 1, subject);
|
|
|
|
|
else
|
|
|
|
|
smfi_addheader(ctx, "Subject", subject);
|
|
|
|
|
+ }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
|
Index: shared/output.c
|
|
|
|
|
--- shared/output.c.orig 2007-03-31 21:27:56 +0200
|
|
|
|
|
+++ shared/output.c 2007-08-08 15:53:27 +0200
|
|
|
|
|
@@ -60,7 +60,7 @@
|
|
|
|
|
pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
-#ifdef C_LINUX
|
|
|
|
|
+#if 0
|
|
|
|
|
#include <libintl.h>
|
|
|
|
|
#include <locale.h>
|
|
|
|
|
|
