projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ferm'
[mirror/dsa-puppet.git]
/
modules
/
exim
/
templates
/
eximconf.erb
diff --git
a/modules/exim/templates/eximconf.erb
b/modules/exim/templates/eximconf.erb
index
e4ed0e7
..
6dd0a37
100644
(file)
--- a/
modules/exim/templates/eximconf.erb
+++ b/
modules/exim/templates/eximconf.erb
@@
-529,7
+529,6
@@
out
accept domains = +local_domains
hosts = +debianhosts
endpass
accept domains = +local_domains
hosts = +debianhosts
endpass
- message = unknown user
verify = recipient
<%=
verify = recipient
<%=
@@
-538,7
+537,6
@@
if nodeinfo['mailrelay']
out = '
accept domains = +mailhubdomains
endpass
out = '
accept domains = +mailhubdomains
endpass
- message = unknown user
verify = recipient/callout=30s,defer_ok,use_sender,no_cache
'
end
verify = recipient/callout=30s,defer_ok,use_sender,no_cache
'
end
@@
-547,7
+545,6
@@
out
accept domains = +submission_domains
endpass
accept domains = +submission_domains
endpass
- message = unknown user
verify = recipient
deny message = relay not permitted
verify = recipient
deny message = relay not permitted
@@
-904,7
+901,6
@@
if nodeinfo['mailrelay']
out = '
accept domains = +mailhubdomains
endpass
out = '
accept domains = +mailhubdomains
endpass
- message = unknown user
verify = recipient/callout=30s,defer_ok,use_sender,no_cache
'
end
verify = recipient/callout=30s,defer_ok,use_sender,no_cache
'
end
@@
-912,7
+908,6
@@
out
%>
accept domains = +handled_domains
endpass
%>
accept domains = +handled_domains
endpass
- message = unknown user
verify = recipient/defer_ok
accept hosts = +debianhosts
verify = recipient/defer_ok
accept hosts = +debianhosts