Created attachment 354253 [details]
diff -c

Description of problem:

spamass-milter (hereafter called SPM) is a milter that is run from sendmail and is used to filter all incoming mail through spamassassin (SA). SPM can be jiggered to either accept the mail or prevent the mail from being accepted. I have it set to reject if I hit a score of 5.0. Occasionally, a false negative gets through and when that happens, I pass it to a script that runs sa-learn and forwards it to spamcop. But, all the messages that were being caught were not being reported to spamcop. So I added the -B option to the SPM invocation. All the spam that was caught was sent to spamcop but spamcop was not able to parse the message. It turns out that a couple of the headers were improperly processed by SPM. If you go to

http://savannah.nongnu.org/bugs/?func=detailitem&item_id=17178

you will see that back in '06, Joe Wagner fixed it, checked it into CVS, and a 0.3.2 was never released.

What I did was to unpack the Fedora f10 src rpm, then unpack the tar.gz file, and compared that with the copy that I sucked out of the CVS repository. There are two small changes. I put a context diff below.

%%%%%%%%%%%%%start of diff%%%%%%%%%%%%%
*** spamass-milter.cpp  Sat Jul 18 08:46:36 2009
--- spamass-milter.cpp~ Thu Mar 23 16:41:36 2006
***************
*** 1002,1010 ****
  
                assassin->output((string)
                        "Received: from "+macro_s+" ("+macro__+")\r\n\t"+
!                       "by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+";\r\n\t"+
                        macro_b+"\r\n\t"+
!                       "(envelope-from "+assassin->from()+")\r\n");
  
        } else
                assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
--- 1002,1010 ----
  
                assassin->output((string)
                        "Received: from "+macro_s+" ("+macro__+")\r\n\t"+
!                       "by "+macro_j+"("+macro_v+"/"+macro_Z+") with "+macro_r+" id "+macro_i+"\r\n\t"+
                        macro_b+"\r\n\t"+
!                       "(envelope-from "+assassin->from()+"\r\n");
  
        } else
                assassin->output((string)"X-Envelope-To: "+envrcpt[0]+"\r\n");
%%%%%%%%%%%%%END OF DIFF%%%%%%%%%%%%%%%
After the patch was applied, I reconstructed the tar.gz file, put it into SOURCES, ran rpm -bc, and replaced the spamass-milter in /usr/sbin. Then I restarted SPB and the -B option did what it was supposed to do, but this time the messed up headers were good and spamcop was able to properly parse the submittal.

Version-Release number of selected component (if applicable):
spamass-milter-0.3.1

How reproducible:
Run SPB with the -B or -b option. You can use any old address to send to yourself. The address will have a missing ')' and a ';' in at least one of the "received" headers.

Steps to Reproduce:
1.
2.
3.
  
Actual results:


Expected results:


Additional info:

I'd be happy to amplify if you need anything else. Also, I did not look at any other changes that might have been made.

To get the src code was just

mkdir spm
cd spm
cvs -z3 -d:pserver:anonymous.nongnu.org:/sources/spamass-milt co .

and the file is spamass-milt/spamass-milter.cpp