[exim] Vacation Return-Path and Dspam

Hi,

Been trying to get the return-path working with dspam. If I comment out the
dspam rules in exim.conf vacation works a dream. The minute I enable dspam
integration exim seems to be setting the Return-Path: <exim@myhostname>.
I've tried playing with return_path_add = false but it doesn't seem to make
a difference.

Here are my configs:

dspam_router:
no_verify
# check_local_user
# When to scan a message :
# - it isn't already flagged as spam from Spamassassin
# - it isn't already flagged as spam from DSPAM
# - it isn't already scanned
# - it isn't local
# - it isn't from one internal domain user to another
condition = "${if and { {!def:h_X-Spam-Flag:} {!def:h_X-DSPAM-Check:}
{!eq {$received_protocol}{local}} {!eq {$sender_address_domain}{$domain}} }
{1}{0}}"
headers_add = "X-Filter-DSPAM-Check: by $primary_hostname on $tod_full"
driver = accept
transport = dspam_spamcheck

# spam-username
dspam_addspam_router:
driver = accept
local_part_prefix = spam-
transport = dspam_addspam

# nospam-username
dspam_falsepositive_router:
driver = accept
local_part_prefix = nospam-
transport = dspam_falsepositive

dspam_spamcheck:
driver = pipe
command = "/usr/local/bin/dspam --user ${lc:$local_part}@${lc:$domain}
-bm %u --mode=teft --deliver=innocent --feature=chained,bnr,noise,whitelist"
home_directory = "/tmp"
current_directory = "/tmp"
user = exim
group = exim
log_output = true
return_fail_output = false
return_path_add = false
message_prefix =
message_suffix =

dspam_addspam:
driver = pipe
command = "/usr/local/bin/dspam --user ${lc:$local_part}@${lc:$domain}
--class=spam --source=error --mode=teft --feature=chained,bnr,noise"
home_directory = "/tmp"
current_directory = "/tmp"
user = exim
group = exim
log_output = true
return_fail_output = true
return_path_add = false
message_prefix =
message_suffix =

dspam_falsepositive:
driver = pipe
command = "/usr/local/bin/dspam --user ${lc:$local_part}@${lc:$domain}
--class=innocent --source=error --mode=teft --deliver=innocent -d -oMr
spam-scanned -f
'$sender_address' ${lc:$local_part}@${lc:$domain}"
home_directory = "/tmp"
current_directory = "/tmp"
user = exim
group = exim
log_output = true
return_fail_output = true
return_path_add = false
message_prefix =
message_suffix =

The final virtual_delivery uses return_path_add but that's the only place in
the config it does.


Please can someone help as im ripping my hair out!

BTW sorry for the crosspost!

Kind Regards,
Chris Bond