On Sat, 19 Dec 2009 14:07:44 +0100
Julien Valroff <jul...@kirya.net> wrote:
> Hi,
>
Hallo Julien,
> Since commit 70ef9cd17c02081a10971c6f64a2770524c138e2, there is a new
> virus option to tracksources.
>
> When enabled, it causes virus to be notified twice in the logs:
> Dec 19 13:50:48 nix dspam[29400]: virus warning: infected message from
> 209.85.219.223
> Dec 19 13:50:48 nix dspam[29400]: infected message from 209.85.219.223
>
> This is confusing for tools like mailgraph which parses the mail logs to
> gather statistics (in that case, virus would be counted twice).
>
> I would propose to remove the "old" warning:
>
> diff --git a/src/dspam.c b/src/dspam.c
> index 574aa70..74fdae0 100644
> --- a/src/dspam.c
> +++ b/src/dspam.c
> @@ -415,10 +415,6 @@ process_message (
> result = DSR_ISSPAM;
> strcpy(CTX->class, LANG_CLASS_VIRUS);
> internally_canned = 1;
> - if (!dspam_getsource (CTX, ip, sizeof (ip)))
> - {
> - LOG(LOG_WARNING, "virus warning: infected message from %s", ip);
> - }
> }
> }
> #endif
>
How about this?:
diff --git a/src/dspam.c b/src/dspam.c
index 574aa70..c119ee1 100644
--- a/src/dspam.c
+++ b/src/dspam.c
@@ -1,4 +1,4 @@
-/* $Id: dspam.c,v 1.385 2009/12/19 01:02:19 sbajic Exp $ */
+/* $Id: dspam.c,v 1.386 2009/12/19 14:45:19 sbajic Exp $ */
/*
DSPAM
@@ -415,9 +415,11 @@ process_message (
result = DSR_ISSPAM;
strcpy(CTX->class, LANG_CLASS_VIRUS);
internally_canned = 1;
- if (!dspam_getsource (CTX, ip, sizeof (ip)))
- {
- LOG(LOG_WARNING, "virus warning: infected message from %s", ip);
+ if(!_ds_match_attribute(agent_config, "TrackSources", "virus")) {
+ if (!dspam_getsource (CTX, ip, sizeof (ip)))
+ {
+ LOG(LOG_WARNING, "virus warning: infected message from %s", ip);
+ }
}
}
}
>
> Cheers,
> Julien
>
--
Kind Regards from Switzerland,
Stevan Bajić
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Dspam-devel mailing list
Dspam-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dspam-devel
