SAaddSAEheaderBeforeSA ignored

--===============0813519903==
Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-VGfKxidVOaiDKeQ6Tbbo"


--=-VGfKxidVOaiDKeQ6Tbbo
Content-Type: multipart/mixed; boundary="=-kmlsYz/DTbThLiAYRF7j"


--=-kmlsYz/DTbThLiAYRF7j
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

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

--=-kmlsYz/DTbThLiAYRF7j
Content-Disposition: attachment; filename="dont-invert-saaddsaeheaderbeforesa.patch"
Content-Type: text/x-patch; name="dont-invert-saaddsaeheaderbeforesa.patch";
	charset="UTF-8"
Content-Transfer-Encoding: base64

SW5kZXg6IHNhLWV4aW0uYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIHNhLWV4aW0uYwkocmV2aXNpb24gNjMp
DQorKysgc2EtZXhpbS5jCSh3b3JraW5nIGNvcHkpDQpAQCAtMTI5Niw3ICsxMjk2LDcgQEANCiAg
ICAgYWZ0ZXJ3YWl0PXRpbWUoTlVMTCk7DQogICAgIGZ1bGx0aW1lPWFmdGVyd2FpdC1iZWZvcmVz
Y2FuOw0KIA0KLSAgICBpZighU0FhZGRTQUVoZWFkZXJCZWZvcmVTQSkNCisgICAgaWYoU0FhZGRT
QUVoZWFkZXJCZWZvcmVTQSkNCiAgICAgew0KIAlBZGRTQUVoZWFkZXJzKChjaGFyICopcmNwdGxp
c3QsIFNBbWF4cmNwdGxpc3RsZW5ndGgpOw0KICAgICB9DQo=


--=-kmlsYz/DTbThLiAYRF7j--

--=-VGfKxidVOaiDKeQ6Tbbo
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAk3UqmsACgkQObn9Ub+O3tOy8wCgigIH6Ngze9Okkcb/xsLFAjy1
h4gAn1GlpN52fw1d9mVy82sfDur80ZFk
=JIta
-----END PGP SIGNATURE-----

--=-VGfKxidVOaiDKeQ6Tbbo--



--===============0813519903==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
SA-Exim mailing list
[email protected]
http://lists.merlins.org/lists/listinfo/sa-exim

--===============0813519903==--