From: Jeremy Harris Date: Mon, 11 Jul 2016 10:55:34 +0000 (+0100) Subject: feature advertise X-Git-Tag: exim-4_88_RC1~52^2~16 X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=aa368db3cd1fe1040bfe90ec1673e9a7c798db9b feature advertise --- diff --git a/src/src/globals.c b/src/src/globals.c index 4f5a922b4..5ff0f844b 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -492,9 +492,10 @@ int check_log_space = 0; BOOL check_rfc2047_length = TRUE; int check_spool_inodes = 0; int check_spool_space = 0; -uschar *client_authenticator = NULL; -uschar *client_authenticated_id = NULL; -uschar *client_authenticated_sender = NULL; +uschar *chunking_advertise_hosts = US"*"; +uschar *client_authenticator = NULL; +uschar *client_authenticated_id = NULL; +uschar *client_authenticated_sender = NULL; int clmacro_count = 0; uschar *clmacros[MAX_CLMACROS]; BOOL config_changed = FALSE; diff --git a/src/src/globals.h b/src/src/globals.h index 6e42bc3d7..e5bdec4a2 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -267,6 +267,7 @@ extern int check_log_space; /* Minimum for message acceptance */ extern BOOL check_rfc2047_length; /* Check RFC 2047 encoded string length */ extern int check_spool_inodes; /* Minimum for message acceptance */ extern int check_spool_space; /* Minimum for message acceptance */ +extern uschar *chunking_advertise_hosts; /* RFC 3030 CHUNKING */ extern uschar *client_authenticator; /* Authenticator name used for smtp delivery */ extern uschar *client_authenticated_id; /* "login" name used for SMTP AUTH */ extern uschar *client_authenticated_sender; /* AUTH option to SMTP MAIL FROM (not yet used) */ diff --git a/src/src/readconf.c b/src/src/readconf.c index 25ff58eb9..a1591e2a1 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -212,6 +212,7 @@ static optionlist optionlist_config[] = { { "check_rfc2047_length", opt_bool, &check_rfc2047_length }, { "check_spool_inodes", opt_int, &check_spool_inodes }, { "check_spool_space", opt_Kint, &check_spool_space }, + { "chunking_advertise_hosts", opt_stringptr, &chunking_advertise_hosts }, { "daemon_smtp_port", opt_stringptr|opt_hidden, &daemon_smtp_port }, { "daemon_smtp_ports", opt_stringptr, &daemon_smtp_port }, { "daemon_startup_retries", opt_int, &daemon_startup_retries }, diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c index 53387011c..bc53166e5 100644 --- a/src/src/smtp_in.c +++ b/src/src/smtp_in.c @@ -1520,14 +1520,6 @@ sender_verified_list = NULL; /* No senders verified */ memset(sender_address_cache, 0, sizeof(sender_address_cache)); memset(sender_domain_cache, 0, sizeof(sender_domain_cache)); -#ifndef DISABLE_PRDR -prdr_requested = FALSE; -#endif - -/* Reset the DSN flags */ -dsn_ret = 0; -dsn_envid = NULL; - authenticated_sender = NULL; #ifdef EXPERIMENTAL_BRIGHTMAIL bmi_run = 0; @@ -1538,6 +1530,11 @@ dkim_signers = NULL; dkim_disable_verify = FALSE; dkim_collect_input = FALSE; #endif +dsn_ret = 0; +dsn_envid = NULL; +#ifndef DISABLE_PRDR +prdr_requested = FALSE; +#endif #ifdef EXPERIMENTAL_SPF spf_header_comment = NULL; spf_received = NULL; @@ -3774,6 +3771,12 @@ while (done <= 0) tls_advertise_hosts. We must *not* advertise if we are already in a secure connection. */ + if (verify_check_host(&chunking_advertise_hosts) != FAIL) + { + s = string_catn(s, &size, &ptr, smtp_code, 3); + s = string_catn(s, &size, &ptr, US"-CHUNKING\r\n", 11); + } + #ifdef SUPPORT_TLS if (tls_in.active < 0 && verify_check_host(&tls_advertise_hosts) != FAIL) diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix index 3beafd9db..39dddd98f 100644 --- a/test/aux-var-src/tls_conf_prefix +++ b/test/aux-var-src/tls_conf_prefix @@ -11,3 +11,4 @@ log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = diff --git a/test/confs/0564 b/test/confs/0564 index e464f963c..6a23896ef 100644 --- a/test/confs/0564 +++ b/test/confs/0564 @@ -7,6 +7,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/3414 b/test/confs/3414 index e151e5fbc..64c3cf48a 100644 --- a/test/confs/3414 +++ b/test/confs/3414 @@ -11,6 +11,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = tls_advertise_hosts = # ----- Main settings ----- diff --git a/test/confs/5601 b/test/confs/5601 index 185b06745..788f509a9 100644 --- a/test/confs/5601 +++ b/test/confs/5601 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = primary_hostname = server1.example.com diff --git a/test/confs/5740 b/test/confs/5740 index 6c4614499..2f0fc25c5 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -10,6 +10,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = primary_hostname = server1.example.com diff --git a/test/stderr/0038 b/test/stderr/0038 index 9f1632db5..8137d8777 100644 --- a/test/stderr/0038 +++ b/test/stderr/0038 @@ -9,6 +9,7 @@ >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/strict @@ -47,6 +48,7 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/strict @@ -84,6 +86,7 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/per_conn/strict @@ -122,6 +125,7 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/per_conn/strict @@ -159,6 +163,7 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/per_rcpt @@ -225,6 +230,7 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt2" >>> processing "warn" >>> check ratelimit = 1/1m/per_rcpt/noupdate diff --git a/test/stderr/0043 b/test/stderr/0043 index 3c6551479..55e719332 100644 --- a/test/stderr/0043 +++ b/test/stderr/0043 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0044 b/test/stderr/0044 index b261277c6..7c3fb0d3f 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : @@ -56,6 +57,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0070 b/test/stderr/0070 index c50f93612..dcfc4286c 100644 --- a/test/stderr/0070 +++ b/test/stderr/0070 @@ -258,6 +258,7 @@ MUNGED: ::1 will be omitted in what follows >>> rhubarb in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "rcpt" >>> processing "require" >>> message: helo not verified diff --git a/test/stderr/0079 b/test/stderr/0079 index 1fb29be98..c46c66aa1 100644 --- a/test/stderr/0079 +++ b/test/stderr/0079 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0080 b/test/stderr/0080 index c5a40d7ba..d9ea2bf81 100644 --- a/test/stderr/0080 +++ b/test/stderr/0080 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check recipients = postmaster@exim.test.ex diff --git a/test/stderr/0121 b/test/stderr/0121 index b578cce97..97cbca9da 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -172,16 +172,21 @@ LOG: 10HmaZ-0005vi-00 H=[127.0.0.1] F= temporarily rejected after >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/0138 b/test/stderr/0138 index 5a69cc1cc..9c30eedec 100644 --- a/test/stderr/0138 +++ b/test/stderr/0138 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : @@ -56,6 +57,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0180 b/test/stderr/0180 index 4fa53882e..7df430b70 100644 --- a/test/stderr/0180 +++ b/test/stderr/0180 @@ -9,6 +9,7 @@ >>> some.host in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -20,3 +21,4 @@ >>> some.host in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/0243 b/test/stderr/0243 index 9b8717fde..dac2ea6e7 100644 --- a/test/stderr/0243 +++ b/test/stderr/0243 @@ -9,6 +9,7 @@ >>> xxxx in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" >>> message: unrouteable address diff --git a/test/stderr/0303 b/test/stderr/0303 index cc6b08b27..598ed62ed 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -26,6 +26,7 @@ >>> V4NET.0.0.1 OK >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -69,6 +70,7 @@ sender_rcvhost = [V4NET.2.3.4] set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4] host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") +host in chunking_advertise_hosts? no (end of list) SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4] 250-SIZE 52428800 250-8BITMIME @@ -142,6 +144,7 @@ sender_rcvhost = host.name.tld ([V4NET.2.3.4]) set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4] host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") +host in chunking_advertise_hosts? no (end of list) SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/0371 b/test/stderr/0371 index 2eabbaa6f..5f97d4e09 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -37,6 +37,7 @@ sender_rcvhost = [V4NET.0.0.0] (helo=something) set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0] host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") +host in chunking_advertise_hosts? no (end of list) SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/0384 b/test/stderr/0384 index 63ba003cd..1906cbd2d 100644 --- a/test/stderr/0384 +++ b/test/stderr/0384 @@ -10,6 +10,7 @@ >>> matched host address >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> [1.2.3.4] in helo_lookup_domains? no (end of list) >>> verifying EHLO/HELO argument "[1.2.3.4]" diff --git a/test/stderr/0487 b/test/stderr/0487 index 1f4f5116e..b332f7f80 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -22,6 +22,7 @@ smtp_setup_msg entered SMTP<< ehlo x.y in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) SMTP>> 250-myhost.test.ex Hello CALLER at x.y 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/0513 b/test/stderr/0513 index 9825070c4..864b2eaa1 100644 --- a/test/stderr/0513 +++ b/test/stderr/0513 @@ -9,6 +9,7 @@ >>> a.b.c.d in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "defer" >>> check !verify = recipient diff --git a/test/stderr/0524 b/test/stderr/0524 index 363c8dfd1..8344d34a6 100644 --- a/test/stderr/0524 +++ b/test/stderr/0524 @@ -9,6 +9,7 @@ >>> csa1.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status @@ -19,6 +20,7 @@ >>> csa2.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status @@ -37,6 +39,7 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization >>> csa1.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status @@ -48,6 +51,7 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization >>> csa2.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status diff --git a/test/stderr/0537 b/test/stderr/0537 index a892e736d..c5a8b3e54 100644 --- a/test/stderr/0537 +++ b/test/stderr/0537 @@ -88,6 +88,7 @@ LOG: sender_ident=ident >>> end of ACL "connect": ACCEPT >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "mail" >>> processing "accept" >>> check acl = log diff --git a/test/stderr/3000 b/test/stderr/3000 index 7615889c8..6aea66ac5 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -59,6 +59,7 @@ LOG: smtp_connection MAIN >>> x.y.z in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "accept" LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. diff --git a/test/stderr/3208 b/test/stderr/3208 index 1eba14049..d25ef58ad 100644 --- a/test/stderr/3208 +++ b/test/stderr/3208 @@ -9,6 +9,7 @@ >>> remote.host in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> test.ex in percent_hack_domains? no (matched "!test.ex") >>> using ACL "check_recipient" >>> processing "accept" diff --git a/test/stderr/3400 b/test/stderr/3400 index 6eda31374..541d08d5a 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -87,6 +87,7 @@ LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1"? yes (matched "10.0.0.1") >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" >>> processing "deny" @@ -290,6 +291,7 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd >>> host in "10.0.0.4"? no (end of list) >>> host in "10.0.0.3 : 10.0.0.4"? yes (matched "10.0.0.3") >>> host in auth_advertise_hosts? yes (matched "+auth_relay_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "warn" >>> check hosts = 10.0.0.5 @@ -385,6 +387,7 @@ LOG: H=(test.host) [10.0.0.3] F= rejected RCPT >> host in "10.0.0.1"? no (end of list) >>> host in "10.0.0.4"? yes (matched "10.0.0.4") >>> host in auth_advertise_hosts? no (matched "!+relay_hosts") +>>> host in chunking_advertise_hosts? no (end of list) Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -437,6 +440,7 @@ host in "10.0.0.1"? no (end of list) host in "10.0.0.4"? no (end of list) host in "10.0.0.3 : 10.0.0.4"? no (end of list) host in auth_advertise_hosts? yes (matched "10.0.0.5") +host in chunking_advertise_hosts? no (end of list) SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/3408 b/test/stderr/3408 index 8c6fb8b25..3f53a120a 100644 --- a/test/stderr/3408 +++ b/test/stderr/3408 @@ -10,6 +10,7 @@ >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : @@ -55,6 +56,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> plain authenticator server_condition: >>> $auth1 = >>> $auth2 = userx diff --git a/test/stderr/3410 b/test/stderr/3410 index 2a6c3d5aa..36fbdb425 100644 --- a/test/stderr/3410 +++ b/test/stderr/3410 @@ -17,6 +17,7 @@ LOG: H=[5.6.9.1] F= rejected RCPT : You must authenticate >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> auth1 authenticator server_condition: >>> $auth1 = >>> $auth2 = userx @@ -50,6 +51,7 @@ LOG: H=[5.6.10.1] F= rejected RCPT >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> auth1 authenticator server_condition: >>> $auth1 = >>> $auth2 = userx @@ -76,6 +78,7 @@ LOG: H=[5.6.10.1] F= rejected RCPT >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> auth2 authenticator server_condition: >>> $auth1 = userx >>> $auth2 = secret diff --git a/test/stderr/3500 b/test/stderr/3500 index 61225ae7d..9f4a5e087 100644 --- a/test/stderr/3500 +++ b/test/stderr/3500 @@ -12,6 +12,7 @@ >>> host in "10.0.0.1 : 10.0.0.5"? no (end of list) >>> host in "10.0.0.4"? yes (matched "10.0.0.4") >>> host in auth_advertise_hosts? no (matched "!+relay_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -25,6 +26,7 @@ >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1") >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3="" >>> CRAM-MD5: user name = tim >>> challenge = <1896.697170952@postoffice.reston.mci.net> @@ -76,6 +78,7 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5") >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3="" >>> CRAM-MD5: user name = tim >>> challenge = <1896.697170952@postoffice.reston.mci.net> diff --git a/test/stderr/5204 b/test/stderr/5204 index b6f852338..e1ed340c0 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -269,6 +269,7 @@ host in helo_accept_junk_hosts? no (option unset) some.name in helo_lookup_domains? no (end of list) host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") +host in chunking_advertise_hosts? no (end of list) processing "accept" check verify = recipient >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/5403 b/test/stderr/5403 index b088f32f1..292f09133 100644 --- a/test/stderr/5403 +++ b/test/stderr/5403 @@ -11,6 +11,7 @@ LOG: no host name found for IP address 1.2.3.4 >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "ar" >>> processing "warn" >>> check control = cutthrough_delivery @@ -39,6 +40,7 @@ LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=es LOG: no host name found for IP address 1.2.3.4 >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "ar" >>> processing "warn" >>> check control = cutthrough_delivery diff --git a/test/stderr/5410 b/test/stderr/5410 index 41f6bab6f..f455075d1 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -9,6 +9,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -254,6 +255,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -468,6 +470,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} diff --git a/test/stderr/5420 b/test/stderr/5420 index 2cac1a73f..9117875ef 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -9,6 +9,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -253,6 +254,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -467,6 +469,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} diff --git a/test/stdout/0572 b/test/stdout/0572 index d6efce012..dbdf4b989 100644 --- a/test/stdout/0572 +++ b/test/stdout/0572 @@ -83,6 +83,7 @@ spool_directory = TESTSUITE/spool log_file_path = TESTSUITE/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = # 1 "TESTSUITE/aux-var/std_conf_prefix" # 5 "TESTSUITE/test-config" primary_hostname = myhost.test.ex @@ -121,6 +122,7 @@ spool_directory = TESTSUITE/spool log_file_path = TESTSUITE/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = # 1 "TESTSUITE/aux-var/std_conf_prefix" # 5 "TESTSUITE/test-config" primary_hostname = myhost.test.ex