summaryrefslogtreecommitdiff
path: root/test/confs
diff options
context:
space:
mode:
Diffstat (limited to 'test/confs')
-rw-r--r--test/confs/058354
-rw-r--r--test/confs/058425
-rw-r--r--test/confs/058527
-rw-r--r--test/confs/058613
-rw-r--r--test/confs/058731
-rw-r--r--test/confs/058837
-rw-r--r--test/confs/058950
-rw-r--r--test/confs/059133
-rw-r--r--test/confs/059340
-rw-r--r--test/confs/059433
-rw-r--r--test/confs/059517
-rw-r--r--test/confs/059637
-rw-r--r--test/confs/059755
-rw-r--r--test/confs/0598 (renamed from test/confs/0621)2
-rw-r--r--test/confs/059960
-rw-r--r--test/confs/060123
-rw-r--r--test/confs/060346
-rw-r--r--test/confs/060458
-rw-r--r--test/confs/060511
-rw-r--r--test/confs/060663
-rw-r--r--test/confs/060841
-rw-r--r--test/confs/061281
-rw-r--r--test/confs/061452
-rw-r--r--test/confs/061560
-rw-r--r--test/confs/061883
-rw-r--r--test/confs/061932
l---------[-rw-r--r--]test/confs/062069
-rw-r--r--test/confs/062249
-rw-r--r--test/confs/062323
-rw-r--r--test/confs/062424
l---------test/confs/06251
31 files changed, 615 insertions, 615 deletions
diff --git a/test/confs/0583 b/test/confs/0583
index ae5b55d46..9a329168a 100644
--- a/test/confs/0583
+++ b/test/confs/0583
@@ -1,24 +1,60 @@
# Exim test configuration 0583
-ERROR_DETAILS=
-
.include DIR/aux-var/std_conf_prefix
primary_hostname = myhost.test.ex
# ----- Main settings -----
-acl_smtp_rcpt = accept
-acl_smtp_data = check_data
-
-ERROR_DETAILS
+acl_smtp_rcpt = chk_rcpt
+log_selector = +millisec
-# ----- ACL ------
+# --- ACL ---
begin acl
-check_data:
- accept verify = not_blind/case_insensitive
+chk_rcpt:
+ deny !verify = recipient/quota=cachepos=20s,cacheneg=100s
+ logwrite = where='$recipient_verify_failure' msg='$acl_verify_message'
+ accept
+
+loggit:
+ accept logwrite = $acl_arg1 was called for $local_part@$domain
+ message = /
+
+# ----- Routers -----
+
+begin routers
+
+localuser:
+ driver = accept
+ local_parts = !route_fail
+ transport = appendfile
+ # set address_data purely to get logging of use of the router
+ address_data = ${acl {loggit}{router }}
+
+failrouter:
+ driver = accept
+ condition = ${if eq {${acl {loggit}{router }}}{} {no}{no}}
+ transport = appendfile
+
+# ----- Transports -----
+
+begin transports
+
+appendfile:
+ driver = appendfile
+ file = DIR/test-mail/themailfile
+ quota = 1k
+ user = CALLER
+ # set homedir purely to get logging of use of the transport
+ home_directory = ${acl {loggit}{transport}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,1d
# End
diff --git a/test/confs/0584 b/test/confs/0584
index 654ecbfb9..868a5e4e5 100644
--- a/test/confs/0584
+++ b/test/confs/0584
@@ -1,14 +1,15 @@
-# Exim test configuration 0005
+# Exim test configuration 0584
.include DIR/aux-var/std_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
-domainlist local_domains = @
+domainlist local_domains = test.ex
acl_smtp_rcpt = check_recipient
-trusted_users = CALLER
+queue_only
# ----- ACL -----
@@ -16,25 +17,17 @@ trusted_users = CALLER
begin acl
check_recipient:
- accept hosts = :
- accept domains = +local_domains
- deny message = relay not permitted
+ require verify = sender=OPT
+ accept
# ----- Routers -----
begin routers
-localuser:
+goodroute:
driver = accept
- check_local_user
- transport = local_delivery
+ local_parts = userx
+ verify_only
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/$local_part
# End
diff --git a/test/confs/0585 b/test/confs/0585
index a0b35e7cf..9bf8fc710 100644
--- a/test/confs/0585
+++ b/test/confs/0585
@@ -1,33 +1,24 @@
# Exim test configuration 0585
+ERROR_DETAILS=
+
.include DIR/aux-var/std_conf_prefix
primary_hostname = myhost.test.ex
# ----- Main settings -----
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
+ERROR_DETAILS
-# ----- Routers -----
-
-begin routers
-
-r2:
- driver = redirect
- local_part_prefix = pipe-
- local_part_suffix = =*
- caseful_local_part = true
- data = |${substr_1:$local_part_suffix}
- pipe_transport = t2
-
+# ----- ACL ------
-# ----- Transports -----
+begin acl
-begin transports
+check_data:
+ accept verify = not_blind/case_insensitive
-t2:
- driver = pipe
- user = CALLER
- batch_max = 10
# End
diff --git a/test/confs/0586 b/test/confs/0586
index 1b2d83571..562837b96 100644
--- a/test/confs/0586
+++ b/test/confs/0586
@@ -2,16 +2,19 @@
.include DIR/aux-var/std_conf_prefix
+primary_hostname = myhost.test.ex
# ----- Main settings -----
+acl_smtp_helo = check_helo
-# ----- Routers -----
-begin routers
+# ----- ACLs -----
-list:
- driver = redirect
- file = DIR/aux-fixed/TESTNUM.list.$local_part
+begin acl
+
+check_helo:
+ require verify = helo
+ accept logwrite = helo $sender_helo_name dnssec <$sender_helo_dnssec>
# End
diff --git a/test/confs/0587 b/test/confs/0587
index c54c63fcd..aff8208e6 100644
--- a/test/confs/0587
+++ b/test/confs/0587
@@ -2,36 +2,13 @@
.include DIR/aux-var/std_conf_prefix
-
# ----- Main settings -----
-domainlist local_domains = @
-
-acl_smtp_rcpt = accept
-trusted_users = CALLER
-
-
-# ----- Routers -----
-
-begin routers
+disable_ipv6 = true
-dump_remote_domains:
- driver = redirect
- domains = ! +local_domains
- data = :blackhole:
+acl_smtp_rcpt = accept hosts = test.again.dns
-localuser:
- driver = accept
- check_local_user
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- file = DIR/test-mail/$local_part_data
+queue_only
# End
+
diff --git a/test/confs/0588 b/test/confs/0588
index 9a88c9c52..314243fd0 100644
--- a/test/confs/0588
+++ b/test/confs/0588
@@ -2,41 +2,18 @@
.include DIR/aux-var/std_conf_prefix
-log_selector = +received_recipients +sender_on_delivery +millisec
+slow_lookup_log = 1000
-# ----- Main settings -----
+acl_smtp_rcpt = accept verify = recipient
-acl_smtp_rcpt = accept
-
-# ----- Routers -----
+queue_only
begin routers
-rx_dump:
- driver = redirect
- condition = ${if !eq {$received_ip_address}{127.0.0.1}}
- data = :blackhole:
-
-smtp_try:
- driver = accept
- transport = send_to_server
-
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
- driver = smtp
- hosts = HOSTIPV4
- allow_localhost
- port = PORT_D
- hosts_try_fastopen = :
-
-# ----- Retry -----
-
-begin retry
-
-* * F,5d,10s
+all:
+ driver = dnslookup
+ verify_only
+ self = send
# End
diff --git a/test/confs/0589 b/test/confs/0589
index b0f731143..080d931f5 100644
--- a/test/confs/0589
+++ b/test/confs/0589
@@ -2,59 +2,41 @@
.include DIR/aux-var/std_conf_prefix
-primary_hostname = myhost.test.ex
+log_selector = +received_recipients +sender_on_delivery +millisec
# ----- Main settings -----
-acl_smtp_rcpt = chk_rcpt
-log_selector = +millisec
-
-# --- ACL ---
-
-begin acl
-
-chk_rcpt:
- deny !verify = recipient/quota=cachepos=20s,cacheneg=100s
- logwrite = where='$recipient_verify_failure' msg='$acl_verify_message'
- accept
-
-loggit:
- accept logwrite = $acl_arg1 was called for $local_part@$domain
- message = /
+acl_smtp_rcpt = accept
# ----- Routers -----
begin routers
-localuser:
- driver = accept
- local_parts = !route_fail
- transport = appendfile
- # set address_data purely to get logging of use of the router
- address_data = ${acl {loggit}{router }}
+rx_dump:
+ driver = redirect
+ condition = ${if !eq {$received_ip_address}{127.0.0.1}}
+ data = :blackhole:
-failrouter:
+smtp_try:
driver = accept
- condition = ${if eq {${acl {loggit}{router }}}{} {no}{no}}
- transport = appendfile
+ transport = send_to_server
# ----- Transports -----
begin transports
-appendfile:
- driver = appendfile
- file = DIR/test-mail/themailfile
- quota = 1k
- user = CALLER
- # set homedir purely to get logging of use of the transport
- home_directory = ${acl {loggit}{transport}}
+send_to_server:
+ driver = smtp
+ hosts = HOSTIPV4
+ allow_localhost
+ port = PORT_D
+ hosts_try_fastopen = :
# ----- Retry -----
begin retry
-* * F,5d,1d
-
+* * F,5d,10s
# End
+
diff --git a/test/confs/0591 b/test/confs/0591
deleted file mode 100644
index 8eaeb0894..000000000
--- a/test/confs/0591
+++ /dev/null
@@ -1,33 +0,0 @@
-# Exim test configuration 0591
-
-.include DIR/aux-var/std_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-domainlist local_domains = test.ex
-
-acl_smtp_rcpt = check_recipient
-queue_only
-
-
-# ----- ACL -----
-
-begin acl
-
-check_recipient:
- require verify = sender=OPT
- accept
-
-# ----- Routers -----
-
-begin routers
-
-goodroute:
- driver = accept
- local_parts = userx
- verify_only
-
-
-# End
diff --git a/test/confs/0593 b/test/confs/0593
new file mode 100644
index 000000000..439374e82
--- /dev/null
+++ b/test/confs/0593
@@ -0,0 +1,40 @@
+# Exim test configuration 0593
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+domainlist local_domains = @
+
+acl_smtp_rcpt = check_recipient
+trusted_users = CALLER
+
+
+# ----- ACL -----
+
+begin acl
+
+check_recipient:
+ accept hosts = :
+ accept domains = +local_domains
+ deny message = relay not permitted
+
+# ----- Routers -----
+
+begin routers
+
+localuser:
+ driver = accept
+ check_local_user
+ transport = local_delivery
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+ driver = appendfile
+ file = DIR/test-mail/$local_part
+
+# End
diff --git a/test/confs/0594 b/test/confs/0594
new file mode 100644
index 000000000..981261206
--- /dev/null
+++ b/test/confs/0594
@@ -0,0 +1,33 @@
+# Exim test configuration 0594
+
+.include DIR/aux-var/std_conf_prefix
+
+primary_hostname = myhost.test.ex
+
+# ----- Main settings -----
+
+
+
+# ----- Routers -----
+
+begin routers
+
+r2:
+ driver = redirect
+ local_part_prefix = pipe-
+ local_part_suffix = =*
+ caseful_local_part = true
+ data = |${substr_1:$local_part_suffix}
+ pipe_transport = t2
+
+
+# ----- Transports -----
+
+begin transports
+
+t2:
+ driver = pipe
+ user = CALLER
+ batch_max = 10
+
+# End
diff --git a/test/confs/0595 b/test/confs/0595
new file mode 100644
index 000000000..2aa247f4b
--- /dev/null
+++ b/test/confs/0595
@@ -0,0 +1,17 @@
+# Exim test configuration 0595
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+
+# ----- Routers -----
+
+begin routers
+
+list:
+ driver = redirect
+ file = DIR/aux-fixed/TESTNUM.list.$local_part
+
+# End
diff --git a/test/confs/0596 b/test/confs/0596
new file mode 100644
index 000000000..bea9e95cf
--- /dev/null
+++ b/test/confs/0596
@@ -0,0 +1,37 @@
+# Exim test configuration 0596
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+domainlist local_domains = @
+
+acl_smtp_rcpt = accept
+trusted_users = CALLER
+
+
+# ----- Routers -----
+
+begin routers
+
+dump_remote_domains:
+ driver = redirect
+ domains = ! +local_domains
+ data = :blackhole:
+
+localuser:
+ driver = accept
+ check_local_user
+ transport = local_delivery
+
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+ driver = appendfile
+ file = DIR/test-mail/$local_part_data
+
+# End
diff --git a/test/confs/0597 b/test/confs/0597
new file mode 100644
index 000000000..dcebf151e
--- /dev/null
+++ b/test/confs/0597
@@ -0,0 +1,55 @@
+# Exim test configuration 0597
+# control = queue/first_pass_route
+
+.include DIR/aux-var/std_conf_prefix
+
+
+# ----- Main settings -----
+
+domainlist local_domains = @
+
+acl_smtp_rcpt = check_rcpt
+
+trusted_users = CALLER
+queue_run_in_order
+
+
+# ----- ACL -----
+
+begin acl
+
+check_rcpt:
+ accept senders = HOSTIPV4
+
+ accept local_parts = ^queue_only.*
+ control = queue_only
+
+ accept local_parts = ^first_pass_route.*
+ control = queue/first_pass_route
+
+# ----- Routers -----
+
+begin routers
+
+discard_remote_source:
+ driver = redirect
+ condition = ${if !eq {$sender_host_address}{127.0.0.1}}
+ data = :blackhole:
+
+outbound:
+ driver = accept
+ transport = smtp
+
+
+# ----- Transports -----
+
+begin transports
+
+smtp:
+ driver = smtp
+ hosts = HOSTIPV4
+ port = PORT_D
+ allow_localhost
+ hosts_try_fastopen = :
+
+# End
diff --git a/test/confs/0621 b/test/confs/0598
index ef3427df9..5e7184d74 100644
--- a/test/confs/0621
+++ b/test/confs/0598
@@ -1,4 +1,4 @@
-# Exim test configuration 0621
+# Exim test configuration 0598
.include DIR/aux-var/std_conf_prefix
diff --git a/test/confs/0599 b/test/confs/0599
index efdbd3c60..ef2ea780f 100644
--- a/test/confs/0599
+++ b/test/confs/0599
@@ -1,55 +1,19 @@
# Exim test configuration 0599
-# control = queue/first_pass_route
-
-.include DIR/aux-var/std_conf_prefix
-
+# udpsend
+
+exim_path = EXIM_PATH
+keep_environment =
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/%slog
+tls_advertise_hosts =
+queue_only
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
# ----- Main settings -----
-domainlist local_domains = @
-
-acl_smtp_rcpt = check_rcpt
-
-trusted_users = CALLER
-queue_run_in_order
-
-
-# ----- ACL -----
-
-begin acl
-
-check_rcpt:
- accept senders = HOSTIPV4
-
- accept local_parts = ^queue_only.*
- control = queue_only
-
- accept local_parts = ^first_pass_route.*
- control = queue/first_pass_route
-
-# ----- Routers -----
-
-begin routers
-
-discard_remote_source:
- driver = redirect
- condition = ${if !eq {$sender_host_address}{127.0.0.1}}
- data = :blackhole:
-
-outbound:
- driver = accept
- transport = smtp
-
-
-# ----- Transports -----
-
-begin transports
+acl_smtp_rcpt = accept udpsend = <; 127.0.0.1 ; 1223 ; message from exim
-smtp:
- driver = smtp
- hosts = HOSTIPV4
- port = PORT_D
- allow_localhost
- hosts_try_fastopen = :
# End
diff --git a/test/confs/0601 b/test/confs/0601
index 8b47f3d7e..d9f37ba0c 100644
--- a/test/confs/0601
+++ b/test/confs/0601
@@ -1,19 +1,32 @@
# Exim test configuration 0601
-# udpsend
+keep_environment = PATH
exim_path = EXIM_PATH
-keep_environment =
spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
+
+log_file_path = DIR/spool/log/%slog : syslog
+
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts =
tls_advertise_hosts =
-queue_only
+
.ifdef _HAVE_DMARC
dmarc_tld_file =
.endif
+primary_hostname = myhost.test.ex
+queue_only
+
# ----- Main settings -----
-acl_smtp_rcpt = accept udpsend = <; 127.0.0.1 ; 1223 ; message from exim
+log_selector = LOG_SELECTOR
+log_timezone = TIMES
+
+syslog_timestamp = ARG1
+syslog_pid = ARG2
+
+acl_not_smtp = accept logwrite = msg
# End
diff --git a/test/confs/0603 b/test/confs/0603
index eaf6a6b90..7e52e00c0 100644
--- a/test/confs/0603
+++ b/test/confs/0603
@@ -1,57 +1,41 @@
# Exim test configuration 0603
-# Add several messages going to the same location
-# And change smtp output based on senders domain
-
-hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
-untrusted_set_sender = *
-
-SERVER =
+# log_defer_output on pipe transport
.include DIR/aux-var/std_conf_prefix
-rfc1413_query_timeout = 0s
-log_selector = +sender_on_delivery
+primary_hostname = myhost.test.ex
# ----- Main settings -----
-acl_smtp_rcpt = accept
+log_selector = +received_recipients
-queue_only
-queue_run_in_order
+#acl_smtp_rcpt = accept
# ----- Routers -----
begin routers
client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- transport = send_to_server
-
-server:
- driver = accept
- transport = send_to_server
-
+ driver = accept
+ transport = pipe
# ----- Transports -----
begin transports
-send_to_server:
- driver = smtp
- connection_max_messages = 0
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- # assumes that HOSTIPV4 can send to 127.0.0.1
- interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+pipe:
+ driver = pipe
+ temp_errors = *
+ command = perl -e "print 'Hi from pipe'; exit 5;"
+ log_defer_output = true
+ path = ${env{PATH}}
# ----- Retry -----
+
begin retry
-* * F,5d,10s
+* * F,1h,10m
-# End
+# End
diff --git a/test/confs/0604 b/test/confs/0604
index 13ad0c2c7..72772abac 100644
--- a/test/confs/0604
+++ b/test/confs/0604
@@ -1,56 +1,30 @@
# Exim test configuration 0604
-# Send many messages in hopes of tripping continuation records code
-hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
-untrusted_set_sender = *
+LOG_SELECTOR=
-SERVER =
+keep_environment = PATH
+exim_path = EXIM_PATH
+spool_directory = DIR/spool
-.include DIR/aux-var/std_conf_prefix
+log_file_path = DIR/spool/log/%slog
-rfc1413_query_timeout = 0s
-log_selector = +sender_on_delivery +millisec
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+chunking_advertise_hosts =
+tls_advertise_hosts =
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+primary_hostname = myhost.test.ex
queue_only
-queue_run_in_order
-
-# ----- Routers -----
-
-begin routers
-
-client:
- driver = accept
- condition = ${if eq {SERVER}{server}{no}{yes}}
- transport = send_to_server
-
-server:
- driver = accept
- transport = send_to_server
+# ----- Main settings -----
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
- driver = smtp
- connection_max_messages = 0
- allow_localhost
- hosts = 127.0.0.1
- port = PORT_D
- hosts_try_fastopen = :
- # assumes that HOSTIPV4 can sent to 127.0.0.1
- interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
-
-# ----- Retry -----
+log_selector = LOG_SELECTOR
-begin retry
+acl_not_smtp = accept
-* * F,5d,10s
# End
-
diff --git a/test/confs/0605 b/test/confs/0605
index 2b5185c57..c3d6d517f 100644
--- a/test/confs/0605
+++ b/test/confs/0605
@@ -1,14 +1,15 @@
# Exim test configuration 0605
+# hosts_connection_nolog versus sender_host lists caching
.include DIR/aux-var/std_conf_prefix
-# ----- Main settings -----
-
-disable_ipv6 = true
+primary_hostname = myhost.test.ex
-acl_smtp_rcpt = accept hosts = test.again.dns
+# ----- Main settings -----
+log_selector = +smtp_connection
+hostlist nolog = 127.0.0.1
+hosts_connection_nolog = +nolog
queue_only
# End
-
diff --git a/test/confs/0606 b/test/confs/0606
index 25706976a..d78b8ba47 100644
--- a/test/confs/0606
+++ b/test/confs/0606
@@ -2,18 +2,67 @@
.include DIR/aux-var/std_conf_prefix
-slow_lookup_log = 1000
-acl_smtp_rcpt = accept verify = recipient
+# ----- Main settings -----
-queue_only
+domainlist local_domains = test.ex
+qualify_domain = test.ex
+
+acl_not_smtp = not_smtp
+
+begin acl
+
+not_smtp:
+ accept log_message = rcpts <$recipients> local_part <$local_part>
+
+# ----- Routers -----
begin routers
-all:
- driver = dnslookup
+hide_verifies:
+ driver = accept
verify_only
- self = send
-# End
+alias:
+ driver = redirect
+ debug_print = DEBUG: $r_r1 $r_r2
+ data = b
+ # r_r1 checks that a variable with tainted data is ok
+ # that the default list-sep ":" is not used for this list
+ # that an '=' on the RHS is ok
+ set = r_r1 = <$local_part> aaa:bbb bar=baz
+ # r_local checks that a variable is immediately usable
+ set = r_local = check
+ errors_to = bad_$r_local
+
+user:
+ driver = accept
+ debug_print = DEBUG: $r_r1 $r_r2
+ # r_r1 vs. r_r2 checks we can have multiple "set" options
+ set = r_r1 = $local_part
+ set = r_r2 = $local_part \
+ 2a00:1940:100::ff:0:1 \
+ foo=bar \
+ # check we can get a newline into content
+ newline=initial\n\tcont \
+ # check we can get a list-sep into content (by doubling)
+ semicolon=initial;;cont \
+ ; \
+ # r_r3 checks we can have a list as arg for a "set" option
+ r_r3 = bletch
+ transport = local_delivery
+
+# ----- Transports -----
+
+begin transports
+
+local_delivery:
+ driver = appendfile
+ envelope_to_add
+ file = DIR/test-mail/${bless:$local_part}
+ user = CALLER
+ headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>
+
+
+# End
diff --git a/test/confs/0608 b/test/confs/0608
index 0ca40c770..a2ec1be27 100644
--- a/test/confs/0608
+++ b/test/confs/0608
@@ -1,4 +1,5 @@
# Exim test configuration 0608
+# Bounces
.include DIR/aux-var/std_conf_prefix
@@ -6,15 +7,43 @@ primary_hostname = myhost.test.ex
# ----- Main settings -----
-acl_smtp_helo = check_helo
+acl_smtp_rcpt = accept
+log_selector = +received_recipients +millisec
+.ifdef OPT
+bounce_message_file = OPT
+warn_message_file = OPT
+.endif
-# ----- ACLs -----
+delay_warning = 1s
-begin acl
+# ----- Routers -----
+
+begin routers
+
+delay:
+ driver = redirect
+ local_parts = ^delay
+ allow_defer
+ data = :defer: deliberate for test purposes
+
+bounces:
+ driver = accept
+ condition = ${if !def:sender_address}
+ transport = savebounce
+
+begin transports
+
+savebounce:
+ driver = appendfile
+ file = DIR/test-mail/bounce_message
+ user = CALLER
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,100s
-check_helo:
- require verify = helo
- accept logwrite = helo $sender_helo_name dnssec <$sender_helo_dnssec>
# End
diff --git a/test/confs/0612 b/test/confs/0612
index 84260df65..da5b72f22 100644
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -1,5 +1,6 @@
# Exim test configuration 0612
-# log_defer_output on pipe transport
+
+SERVER =
.include DIR/aux-var/std_conf_prefix
@@ -7,35 +8,87 @@ primary_hostname = myhost.test.ex
# ----- Main settings -----
+.ifdef OPT
+dsn_advertise_hosts = *
+.endif
+delay_warning = 6s : 24h
+
+accept_8bitmime = false
+pipelining_advertise_hosts = :
+
+trusted_users = CALLER
+acl_smtp_rcpt = rcpt
+
log_selector = +received_recipients
+queue_only
+queue_run_in_order
+
+
+event_action = ${acl {ev_log}}
+
+#
-#acl_smtp_rcpt = accept
+begin acl
+
+ev_log:
+ accept logwrite = event $event_name
+
+rcpt:
+ accept hosts = HOSTIPV4
+
+ deny local_parts = rmt_reject
+ defer local_parts = rmt_defer
+ accept
# ----- Routers -----
begin routers
-client:
+r_dump:
+ driver = redirect
+ domains = dump.ex
+ data = :blackhole:
+
+r1:
driver = accept
- transport = pipe
+ condition = ${if eq {127.0.0.1}{$sender_host_address}}
+ transport = tofile
+
+r2:
+ driver = manualroute
+ local_parts = ^rmt_.*
+ route_list = * 127.0.0.1::PORT_D
+ self = send
+ transport = smtp
+
+r3:
+ driver = manualroute
+ local_parts = deferred
+ route_list = * 127.0.0.1::PORT_S
+ self = send
+ transport = bad_tpt
# ----- Transports -----
begin transports
-pipe:
- driver = pipe
- temp_errors = *
- command = perl -e "print 'Hi from pipe'; exit 5;"
- log_defer_output = true
- path = ${env{PATH}}
+smtp:
+ driver = smtp
+ event_action = ${acl {ev_log}}
+ hosts_try_fastopen = :
-# ----- Retry -----
+bad_tpt:
+ driver = smtp
+ connect_timeout = 1s
+ event_action = ${acl {ev_log}}
+tofile:
+ driver = appendfile
+ file = DIR/test-mail/${bless:$local_part}
+ user = CALLER
+ event_action = ${acl {ev_log}}
begin retry
-* * F,1h,10m
-
-
+* * F,2m,10s
# End
diff --git a/test/confs/0614 b/test/confs/0614
index d19be4e74..eec6d3259 100644
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -1,15 +1,57 @@
# Exim test configuration 0614
-# hosts_connection_nolog versus sender_host lists caching
+# Add several messages going to the same location
+# And change smtp output based on senders domain
+
+hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
+untrusted_set_sender = *
+
+SERVER =
.include DIR/aux-var/std_conf_prefix
-primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+log_selector = +sender_on_delivery
# ----- Main settings -----
-log_selector = +smtp_connection
-hostlist nolog = 127.0.0.1
-hosts_connection_nolog = +nolog
+acl_smtp_rcpt = accept
+
queue_only
+queue_run_in_order
+
+# ----- Routers -----
+
+begin routers
+
+client:
+ driver = accept
+ condition = ${if eq {SERVER}{server}{no}{yes}}
+ transport = send_to_server
+
+server:
+ driver = accept
+ transport = send_to_server
+
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+ driver = smtp
+ connection_max_messages = 0
+ allow_localhost
+ hosts = 127.0.0.1
+ port = PORT_D
+ hosts_try_fastopen = :
+ # assumes that HOSTIPV4 can send to 127.0.0.1
+ interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,10s
# End
+
diff --git a/test/confs/0615 b/test/confs/0615
index 0cf5769a9..a1aae2acd 100644
--- a/test/confs/0615
+++ b/test/confs/0615
@@ -1,32 +1,56 @@
# Exim test configuration 0615
+# Send many messages in hopes of tripping continuation records code
-keep_environment = PATH
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
+hostlist loopback = <; 127.0.0.0/8 ; 0.0.0.0 ; ::1 ; 0000:0000:0000:0000:0000:ffff
+untrusted_set_sender = *
-log_file_path = DIR/spool/log/%slog : syslog
+SERVER =
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-chunking_advertise_hosts =
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
-.ifdef _HAVE_DMARC
-dmarc_tld_file =
-.endif
+rfc1413_query_timeout = 0s
+log_selector = +sender_on_delivery +millisec
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
-primary_hostname = myhost.test.ex
queue_only
+queue_run_in_order
-# ----- Main settings -----
+# ----- Routers -----
+
+begin routers
+
+client:
+ driver = accept
+ condition = ${if eq {SERVER}{server}{no}{yes}}
+ transport = send_to_server
-log_selector = LOG_SELECTOR
-log_timezone = TIMES
+server:
+ driver = accept
+ transport = send_to_server
-syslog_timestamp = ARG1
-syslog_pid = ARG2
-acl_not_smtp = accept logwrite = msg
+# ----- Transports -----
+begin transports
+
+send_to_server:
+ driver = smtp
+ connection_max_messages = 0
+ allow_localhost
+ hosts = 127.0.0.1
+ port = PORT_D
+ hosts_try_fastopen = :
+ # assumes that HOSTIPV4 can sent to 127.0.0.1
+ interface = ${if eq {$sender_address_domain}{dustybelt.tld} {127.0.0.1}{HOSTIPV4}}
+
+# ----- Retry -----
+
+begin retry
+
+* * F,5d,10s
# End
+
diff --git a/test/confs/0618 b/test/confs/0618
index d212e9875..420e29041 100644
--- a/test/confs/0618
+++ b/test/confs/0618
@@ -1,94 +1,23 @@
# Exim test configuration 0618
-SERVER =
-
.include DIR/aux-var/std_conf_prefix
-primary_hostname = myhost.test.ex
# ----- Main settings -----
-.ifdef OPT
-dsn_advertise_hosts = *
-.endif
-delay_warning = 6s : 24h
-
-accept_8bitmime = false
-pipelining_advertise_hosts = :
+domainlist local_domains = @
-trusted_users = CALLER
-acl_smtp_rcpt = rcpt
+acl_smtp_rcpt = chk_rcpt
-log_selector = +received_recipients
queue_only
-queue_run_in_order
-
-event_action = ${acl {ev_log}}
-#
+# ----- ACL -----
begin acl
-ev_log:
- accept logwrite = event $event_name
-
-rcpt:
- accept hosts = HOSTIPV4
-
- deny local_parts = rmt_reject
- defer local_parts = rmt_defer
- accept
-
-# ----- Routers -----
-
-begin routers
-
-r_dump:
- driver = redirect
- domains = dump.ex
- data = :blackhole:
-
-r1:
- driver = accept
- condition = ${if eq {127.0.0.1}{$sender_host_address}}
- transport = tofile
-
-r2:
- driver = manualroute
- local_parts = ^rmt_.*
- route_list = * 127.0.0.1::PORT_D
- self = send
- transport = smtp
-
-r3:
- driver = manualroute
- local_parts = deferred
- route_list = * 127.0.0.1::PORT_S
- self = send
- transport = bad_tpt
-
-# ----- Transports -----
-
-begin transports
-
-smtp:
- driver = smtp
- event_action = ${acl {ev_log}}
- hosts_try_fastopen = :
-
-bad_tpt:
- driver = smtp
- connect_timeout = 1s
- event_action = ${acl {ev_log}}
-
-tofile:
- driver = appendfile
- file = DIR/test-mail/${bless:$local_part}
- user = CALLER
- event_action = ${acl {ev_log}}
-
-begin retry
+chk_rcpt:
+ accept local_parts = lsearch;DIR/aux-fixed/TESTNUM.list
+ domains = lsearch;DIR/aux-fixed/TESTNUM.list
-* * F,2m,10s
# End
diff --git a/test/confs/0619 b/test/confs/0619
index dcb7fa89e..0736be60a 100644
--- a/test/confs/0619
+++ b/test/confs/0619
@@ -1,30 +1,24 @@
# Exim test configuration 0619
-LOG_SELECTOR=
+.include DIR/aux-var/std_conf_prefix
-keep_environment = PATH
-exim_path = EXIM_PATH
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-chunking_advertise_hosts =
-tls_advertise_hosts =
-
-.ifdef _HAVE_DMARC
-dmarc_tld_file =
-.endif
+# ----- Main settings -----
-primary_hostname = myhost.test.ex
-queue_only
+primary_hostname = primaryhostname.ex
+hosts_treat_as_local = 46.test.ex
+allow_domain_literals
-# ----- Main settings -----
+acl_smtp_rcpt = chk_rcpt
-log_selector = LOG_SELECTOR
+# ----- ACL -----
-acl_not_smtp = accept
+begin acl
+chk_rcpt:
+ accept domains = OPT
+ logwrite = domain $domain
+ logwrite = value $domain_data
+ logwrite = \$0 '$0' \$1 '$1'
# End
diff --git a/test/confs/0620 b/test/confs/0620
index 6ee5ac654..00d739d6a 100644..120000
--- a/test/confs/0620
+++ b/test/confs/0620
@@ -1,68 +1 @@
-# Exim test configuration 0166
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-domainlist local_domains = test.ex
-qualify_domain = test.ex
-
-acl_not_smtp = not_smtp
-
-begin acl
-
-not_smtp:
- accept log_message = rcpts <$recipients> local_part <$local_part>
-
-# ----- Routers -----
-
-begin routers
-
-hide_verifies:
- driver = accept
- verify_only
-
-alias:
- driver = redirect
- debug_print = DEBUG: $r_r1 $r_r2
- data = b
- # r_r1 checks that a variable with tainted data is ok
- # that the default list-sep ":" is not used for this list
- # that an '=' on the RHS is ok
- set = r_r1 = <$local_part> aaa:bbb bar=baz
- # r_local checks that a variable is immediately usable
- set = r_local = check
- errors_to = bad_$r_local
-
-user:
- driver = accept
- debug_print = DEBUG: $r_r1 $r_r2
- # r_r1 vs. r_r2 checks we can have multiple "set" options
- set = r_r1 = $local_part
- set = r_r2 = $local_part \
- 2a00:1940:100::ff:0:1 \
- foo=bar \
- # check we can get a newline into content
- newline=initial\n\tcont \
- # check we can get a list-sep into content (by doubling)
- semicolon=initial;;cont \
- ; \
- # r_r3 checks we can have a list as arg for a "set" option
- r_r3 = bletch
- transport = local_delivery
-
-
-# ----- Transports -----
-
-begin transports
-
-local_delivery:
- driver = appendfile
- envelope_to_add
- file = DIR/test-mail/${bless:$local_part}
- user = CALLER
- headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3>
-
-
-# End
+0619 \ No newline at end of file
diff --git a/test/confs/0622 b/test/confs/0622
deleted file mode 100644
index 486bac27d..000000000
--- a/test/confs/0622
+++ /dev/null
@@ -1,49 +0,0 @@
-# Exim test configuration 0622
-# Bounces
-
-.include DIR/aux-var/std_conf_prefix
-
-primary_hostname = myhost.test.ex
-
-# ----- Main settings -----
-
-acl_smtp_rcpt = accept
-log_selector = +received_recipients +millisec
-
-.ifdef OPT
-bounce_message_file = OPT
-warn_message_file = OPT
-.endif
-
-delay_warning = 1s
-
-# ----- Routers -----
-
-begin routers
-
-delay:
- driver = redirect
- local_parts = ^delay
- allow_defer
- data = :defer: deliberate for test purposes
-
-bounces:
- driver = accept
- condition = ${if !def:sender_address}
- transport = savebounce
-
-begin transports
-
-savebounce:
- driver = appendfile
- file = DIR/test-mail/bounce_message
- user = CALLER
-
-# ----- Retry -----
-
-begin retry
-
-* * F,5d,100s
-
-
-# End
diff --git a/test/confs/0623 b/test/confs/0623
deleted file mode 100644
index 7ac0ad3c5..000000000
--- a/test/confs/0623
+++ /dev/null
@@ -1,23 +0,0 @@
-# Exim test configuration 0623
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-domainlist local_domains = @
-
-acl_smtp_rcpt = chk_rcpt
-
-queue_only
-
-
-# ----- ACL -----
-
-begin acl
-
-chk_rcpt:
- accept local_parts = lsearch;DIR/aux-fixed/TESTNUM.list
- domains = lsearch;DIR/aux-fixed/TESTNUM.list
-
-# End
diff --git a/test/confs/0624 b/test/confs/0624
deleted file mode 100644
index c8178d22b..000000000
--- a/test/confs/0624
+++ /dev/null
@@ -1,24 +0,0 @@
-# Exim test configuration 0624
-
-.include DIR/aux-var/std_conf_prefix
-
-
-# ----- Main settings -----
-
-primary_hostname = primaryhostname.ex
-hosts_treat_as_local = 46.test.ex
-allow_domain_literals
-
-acl_smtp_rcpt = chk_rcpt
-
-# ----- ACL -----
-
-begin acl
-
-chk_rcpt:
- accept domains = OPT
- logwrite = domain $domain
- logwrite = value $domain_data
- logwrite = \$0 '$0' \$1 '$1'
-
-# End
diff --git a/test/confs/0625 b/test/confs/0625
deleted file mode 120000
index f9ae37c6a..000000000
--- a/test/confs/0625
+++ /dev/null
@@ -1 +0,0 @@
-0624 \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 03:04:29 +0000