[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-167-g4319a8f

[acab]

The following commit has been merged in the debian/unstable branch:
commit d24021c2121847b34bbeab7d9a36894817dd6e39
Author: acab <acab at 77e5149b-7576-45b1-b177-96237e5ba77b>
Date:   Thu Apr 16 14:20:29 2009 +0000

    documentation update for LogInfected
    
    git-svn-id: http://svn.clamav.net/svn/clamav-devel/trunk@5042 77e5149b-7576-45b1-b177-96237e5ba77b

diff --git a/ChangeLog b/ChangeLog
index 5267eb9..4a0518f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 16 16:17:23 CEST 2009 (acab)
+------------------------------------
+ * shared/optparser.c, etc/clamav-milter.conf: document how to make
+   macroes available in oem for LogInfected to work properly
+   Many thanks to Dick St.Peters <stpeters*netheaven.com>
+
 Tue Apr 15 18:47:22 CEST 2009 (acab)
 ------------------------------------
  * clamav-milter: add support for action QuarantineReject (bb#1549)
diff --git a/etc/clamav-milter.conf b/etc/clamav-milter.conf
index 84b9e03..3314f69 100644
--- a/etc/clamav-milter.conf
+++ b/etc/clamav-milter.conf
@@ -224,6 +224,13 @@ Example
 # This option allows to tune what is logged when a message is infected.
 # Possible values are Off (the default - nothing is logged),
 # Basic (minimal info logged), Full (verbose info logged)
+# Note:
+# For this to work properly in sendmail, make sure the msg_id, mail_addr,
+# rcpt_addr and i macroes are available in eom. In other words add a line like:
+# Milter.macros.eom={msg_id}, {mail_addr}, {rcpt_addr}, i
+# to your .cf file. Alternatively use the macro:
+# define(`confMILTER_MACROS_EOM', `{msg_id}, {mail_addr}, {rcpt_addr}, i')
+# Postfix should be working fine with the default settings.
 #
 # Default: disabled
 #LogInfected Basic
diff --git a/shared/optparser.c b/shared/optparser.c
index 8f0a32a..9528589 100644
--- a/shared/optparser.c
+++ b/shared/optparser.c
@@ -389,7 +389,7 @@ const struct clam_option clam_options[] = {
 
     { "SkipAuthenticated", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "Messages from authenticated SMTP users matching this extended POSIX\nregular expression (egrep-like) will not be scanned.\nNote: this is the AUTH login name!", "SkipAuthenticated ^(tom|dick|henry)$" },
 
-    { "LogInfected", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "This option allows to tune what is logged when a message is infected.\nPossible values are Off (the default - nothing is logged),\nBasic (minimal info logged), Full (verbose info logged)", "Basic" },
+    { "LogInfected", NULL, 0, TYPE_STRING, NULL, -1, NULL, 0, OPT_MILTER, "This option allows to tune what is logged when a message is infected.\nPossible values are Off (the default - nothing is logged),\nBasic (minimal info logged), Full (verbose info logged)\nNote:\nFor this to work properly in sendmail, make sure the msg_id, mail_addr,\nrcpt_addr and i macroes are available in eom. In other words add a line like:\nMilter.macros.eom={msg_id}, {mail_addr}, {rcpt_addr}, i\nto your .cf file. Alternatively use the macro:\ndefine(`confMILTER_MACROS_EOM', `{msg_id}, {mail_addr}, {rcpt_addr}, i')\nPostfix should be working fine with the default settings.", "Basic" },
 
     /* Deprecated milter options */
 

-- 
Debian repository for ClamAV