You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
28 lines
1.1 KiB
28 lines
1.1 KiB
This change is to help users with Postfix that aren't using the -a option |
|
to not pass mail from authenticated users through SpamAssassin. Postfix, |
|
unlike Sendmail, does not provide the {auth_ssf} macro, so in the case |
|
where mail is from an authenticated user, the modified code can now add |
|
an (authenticated) hint in the dummy Received: header (where Sendmail would |
|
add (authenticated bits=nnn)), and this is scored favourably by SpamAssassin. |
|
|
|
http://bugzilla.redhat.com/730308 |
|
|
|
--- spamass-milter.cpp |
|
+++ spamass-milter.cpp |
|
@@ -1069,9 +1069,14 @@ mlfi_envrcpt(SMFICTX* ctx, char** envrcp |
|
|
|
rec_header = (string) "Received: from " + macro_s + " (" + macro__ + ")\r\n\t"; |
|
|
|
- if (strlen(macro_auth_ssf)) |
|
+ if (strlen(macro_auth_authen)) |
|
{ |
|
- rec_header += (string) "(authenticated bits=" + macro_auth_ssf + ")\r\n\t"; |
|
+ rec_header += (string) "(authenticated"; |
|
+ if (strlen(macro_auth_ssf)) |
|
+ { |
|
+ rec_header += (string) " bits=" + macro_auth_ssf; |
|
+ } |
|
+ rec_header += (string) ")\r\n\t"; |
|
} |
|
|
|
rec_header += (string) "by " + macro_j + " (" + macro_v + "/" + macro_Z + ") with " +
|
|
|