git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARC: harden versus badly-formatted AMS line
[users/jgh/exim.git]
/
test
/
confs
/
0478
diff --git
a/test/confs/0478
b/test/confs/0478
index 243e47b2aa22c77a8f2b68618dc0d22b0d940b75..cfb9a17b1af20023eb263121231fc0f5eb642c75 100644
(file)
--- a/
test/confs/0478
+++ b/
test/confs/0478
@@
-2,14
+2,8
@@
SERVER=
SERVER=
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+
# ----- Main settings -----
# ----- Main settings -----
@@
-33,7
+27,9
@@
begin transports
t1:
driver = smtp
port = PORT_D
t1:
driver = smtp
port = PORT_D
- hosts = ${if eq {$sender_host_address}{}{$local_part}{V4NET.0.0.2}}
+ hosts = ${if !eq {$sender_host_address}{} {V4NET.0.0.2} \
+ {${if eq {127.0.0.1}{$local_part} {127.0.0.1} \
+ {${if eq {V4NET.0.0.1}{$local_part} {V4NET.0.0.1}}}}}}
allow_localhost
connect_timeout = 1s
allow_localhost
connect_timeout = 1s