[SA-exim] SAaddSAEheaderBeforeSA ignored

[Daniel Dadap]

Hello,

I was trying to disable SAaddSAEheaderBeforeSA in sa-exim.conf, but no
matter what I did, I was still getting unwanted headers in all my
messages.

I took a quick look at the source, and noticed the following:

    if(SAaddSAEheaderBeforeSA)
    {
	AddSAEheaders((char *)rcptlist, SAmaxrcptlistlength);
    }

... and a little bit later...

    if(!SAaddSAEheaderBeforeSA)
    {
	AddSAEheaders((char *)rcptlist, SAmaxrcptlistlength);
    }

This doesn't seem intentional. I removed the ! from the second check,
and setting SAaddSAEheaderBeforeSA worked as intended. I didn't read the
code closely enough to know whether it's actually necessary to check in
both places, so the attached patch only removes the negation and doesn't
make any attempt to do anything else.

It's entirely possible that the ! is intentional, and that I've
misunderstood the intended operation of the program, but I'm going to
leave my sa-exim patched like this, because it finally works the way I
want it to. :)

Regards,

Daniel Dadap
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dont-invert-saaddsaeheaderbeforesa.patch
Type: text/x-patch
Size: 377 bytes
Desc: not available
URL: <http://lists.merlins.org/archives/sa-exim/attachments/20110518/a40aa898/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part
URL: <http://lists.merlins.org/archives/sa-exim/attachments/20110518/a40aa898/attachment.pgp>