On Sun, Oct 01, 2006 at 11:08:23PM -0700, Jo Rhett wrote:
> The release notes for amavisd 2.4.3 indicate that amavisd-milter 1.1.3
> is required to support changes in the AM.PDP protocol. When can we
> expect a release of this?
Since nobody is apparently overly interested in this issue,
but it's affecting me greatly, I decided to hack together a
patch for myself. It's attached.
Note: it's a hack, and doesn't actually implement the new
functionality so it will continue to break DKIM. It's just
something that allows those of us who foolishly went forward
to 2.4.3 to get the SpamAssassin headers back again.
--
Jo Rhett
Network/Software Engineer
Net Consonance
--- amavisd-milter/mlfi.c_orig Tue Oct 3 17:12:19 2006
+++ amavisd-milter/mlfi.c Tue Oct 3 17:34:33 2006
@@ -784,12 +784,15 @@
}
/* Add header */
- } else if (strcmp(name, "addheader") == 0) {
+ } else if (strcmp(name, "insheader") == 0) {
LOGQIDMSG(LOG_INFO, "%s=%s", name, value);
- AMAVISD_RESPONSE(header, value, ' ');
- if (smfi_addheader(ctx, header, value) != MI_SUCCESS) {
+ char* value_minus_placement;
+ value_minus_placement = strchr( value, ' '); /* new string after
the placement entry */
+ value_minus_placement++; /* skip the space itself */
+ AMAVISD_RESPONSE(header, value_minus_placement, ' ');
+ if (smfi_addheader(ctx, header, value_minus_placement) !=
MI_SUCCESS) {
LOGQIDERR(LOG_ERR, "could not add header %s: %s", header,
- value);
+ value_minus_placement);
SMFI_SETREPLY_TEMPFAIL();
(void) amavisd_close(sd);
return SMFIS_TEMPFAIL;
@@ -875,6 +878,11 @@
/* Exit code */
} else if (strcmp(name, "exit_code") == 0) {
/* ignore legacy exit_code */
+ LOGQIDMSG(LOG_DEBUG, "%s=%s", name, value);
+
+ /* Version code */
+ } else if (strcmp(name, "version_server") == 0) {
+ /* ignore new version */
LOGQIDMSG(LOG_DEBUG, "%s=%s", name, value);
/* Unknown response */
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
AMaViS-user mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/amavis-user
AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3
AMaViS-HowTos:http://www.amavis.org/howto/
