From fbbd45ff5ade30d38ca60ea5aeccc305501c9174 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 21 Aug 2016 23:44:06 +0100 Subject: [PATCH] Add automatic macros for compile-time feature options --- doc/doc-txt/NewStuff | 4 + src/src/readconf.c | 231 +++++++++++++++++++++ test/README | 2 +- test/confs/0230 | 2 +- test/confs/0290 | 4 +- test/confs/0465 | 4 +- test/confs/0551 | 4 +- test/confs/0557 | 8 +- test/confs/0900 | 4 +- test/confs/3414 | 4 +- test/confs/5600 | 2 +- test/confs/5601 | 2 +- test/confs/5740 | 2 +- test/scripts/0000-Basic/0230 | 4 +- test/scripts/0000-Basic/0290 | 6 +- test/scripts/0000-Basic/0465 | 4 +- test/scripts/0000-Basic/0551 | 2 +- test/scripts/0000-Basic/0557 | 10 +- test/scripts/2000-GnuTLS/2090 | 2 +- test/scripts/2000-GnuTLS/2091 | 2 +- test/scripts/2100-OpenSSL/2190 | 2 +- test/scripts/2100-OpenSSL/2191 | 9 +- test/scripts/3400-plaintext/3414 | 4 +- test/scripts/5600-OCSP-OpenSSL/5600 | 8 +- test/scripts/5600-OCSP-OpenSSL/5601 | 10 +- test/scripts/5740-OCSP-OpenSSL-events/5740 | 10 +- 26 files changed, 294 insertions(+), 52 deletions(-) mode change 120000 => 100644 test/scripts/2100-OpenSSL/2191 diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 219c3c3fb..b9ed8a00d 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -37,6 +37,10 @@ Version 4.88 9. Expansion operator escape8bit, like escape but not touching newline etc.. +10. Feature macros, generated from compile options. All start with "_HAVE_" + and go on with some roughly recognisable name. Use the "-bP macros" + command-line option to see what is present. + Version 4.87 ------------ diff --git a/src/src/readconf.c b/src/src/readconf.c index c145c7749..646932412 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -3003,6 +3003,234 @@ return status == 0; +/*************************************************/ +/* Create compile-time feature macros */ +static void +readconf_features(void) +{ +/* Probably we could work out a static initialiser for wherever +macros are stored, but this will do for now. Some names are awkward +due to conflicts with other common macros. */ + +#ifdef SUPPORT_CRYPTEQ + read_macro_assignment("_HAVE_CRYPTEQ=y"); +#endif +#if HAVE_ICONV + read_macro_assignment("_HAVE_ICONV=y"); +#endif +#if HAVE_IPV6 + read_macro_assignment("_HAVE_IPV6=y"); +#endif +#ifdef HAVE_SETCLASSRESOURCES + read_macro_assignment("_HAVE_SETCLASSRESOURCES=y"); +#endif +#ifdef SUPPORT_PAM + read_macro_assignment("_HAVE_PAM=y"); +#endif +#ifdef EXIM_PERL + read_macro_assignment("_HAVE_PERL=y"); +#endif +#ifdef EXPAND_DLFUNC + read_macro_assignment("_HAVE_DLFUNC=y"); +#endif +#ifdef USE_TCP_WRAPPERS + read_macro_assignment("_HAVE_TCPWRAPPERS=y"); +#endif +#ifdef SUPPORT_TLS + read_macro_assignment("_HAVE_TLS=y"); +# ifdef USE_GNUTLS + read_macro_assignment("_HAVE_GNUTLS=y"); +# else + read_macro_assignment("_HAVE_OPENSSL=y"); +# endif +#endif +#ifdef SUPPORT_TRANSLATE_IP_ADDRESS + read_macro_assignment("_HAVE_TRANSLATE_IP_ADDRESS=y"); +#endif +#ifdef SUPPORT_MOVE_FROZEN_MESSAGES + read_macro_assignment("_HAVE_MOVE_FROZEN_MESSAGES=y"); +#endif +#ifdef WITH_CONTENT_SCAN + read_macro_assignment("_HAVE_CONTENT_SCANNING=y"); +#endif +#ifndef DISABLE_DKIM + read_macro_assignment("_HAVE_DKIM=y"); +#endif +#ifndef DISABLE_DNSSEC + read_macro_assignment("_HAVE_DNSSEC=y"); +#endif +#ifndef DISABLE_EVENT + read_macro_assignment("_HAVE_Event=y"); +#endif +#ifdef SUPPORT_I18N + read_macro_assignment("_HAVE_I18N=y"); +#endif +#ifndef DISABLE_OCSP + read_macro_assignment("_HAVE_OCSP=y"); +#endif +#ifndef DISABLE_PRDR + read_macro_assignment("_HAVE_PRDR=y"); +#endif +#ifdef SUPPORT_PROXY + read_macro_assignment("_HAVE_PROXY=y"); +#endif +#ifdef SUPPORT_SOCKS + read_macro_assignment("_HAVE_SOCKS=y"); +#endif +#ifdef EXPERIMENTAL_LMDB + read_macro_assignment("_HAVE_LMDB=y"); +#endif +#ifdef EXPERIMENTAL_SPF + read_macro_assignment("_HAVE_SPF=y"); +#endif +#ifdef EXPERIMENTAL_SRS + read_macro_assignment("_HAVE_SRS=y"); +#endif +#ifdef EXPERIMENTAL_BRIGHTMAIL + read_macro_assignment("_HAVE_BRIGHTMAIL=y"); +#endif +#ifdef EXPERIMENTAL_DANE + read_macro_assignment("_HAVE_DANE=y"); +#endif +#ifdef EXPERIMENTAL_DCC + read_macro_assignment("_HAVE_DCC=y"); +#endif +#ifdef EXPERIMENTAL_DMARC + read_macro_assignment("_HAVE_DMARC=y"); +#endif +#ifdef EXPERIMENTAL_DSN_INFO + read_macro_assignment("_HAVE_DSN_INFO=y"); +#endif + +#ifdef LOOKUP_LSEARCH + read_macro_assignment("_HAVE_LKUP_LSEARCH=y"); +#endif +#ifdef LOOKUP_CDB + read_macro_assignment("_HAVE_LKUP_CDB=y"); +#endif +#ifdef LOOKUP_DBM + read_macro_assignment("_HAVE_LKUP_DBM=y"); +#endif +#ifdef LOOKUP_DNSDB + read_macro_assignment("_HAVE_LKUP_DNSDB=y"); +#endif +#ifdef LOOKUP_DSEARCH + read_macro_assignment("_HAVE_LKUP_DSEARCH=y"); +#endif +#ifdef LOOKUP_IBASE + read_macro_assignment("_HAVE_LKUP_IBASE=y"); +#endif +#ifdef LOOKUP_LDAP + read_macro_assignment("_HAVE_LKUP_LDAP=y"); +#endif +#ifdef EXPERIMENTAL_LMDB + read_macro_assignment("_HAVE_LKUP_LMDB=y"); +#endif +#ifdef LOOKUP_MYSQL + read_macro_assignment("_HAVE_LKUP_MYSQL=y"); +#endif +#ifdef LOOKUP_NIS + read_macro_assignment("_HAVE_LKUP_NIS=y"); +#endif +#ifdef LOOKUP_NISPLUS + read_macro_assignment("_HAVE_LKUP_NISPLUS=y"); +#endif +#ifdef LOOKUP_ORACLE + read_macro_assignment("_HAVE_LKUP_ORACLE=y"); +#endif +#ifdef LOOKUP_PASSWD + read_macro_assignment("_HAVE_LKUP_PASSWD=y"); +#endif +#ifdef LOOKUP_PGSQL + read_macro_assignment("_HAVE_LKUP_PGSQL=y"); +#endif +#ifdef LOOKUP_REDIS + read_macro_assignment("_HAVE_LKUP_REDIS=y"); +#endif +#ifdef LOOKUP_SQLITE + read_macro_assignment("_HAVE_LKUP_SQLITE=y"); +#endif +#ifdef LOOKUP_TESTDB + read_macro_assignment("_HAVE_LKUP_TESTDB=y"); +#endif +#ifdef LOOKUP_WHOSON + read_macro_assignment("_HAVE_LKUP_WHOSON=y"); +#endif + +#ifdef AUTH_CRAM_MD5 + read_macro_assignment("_HAVE_AUTH_CRAM_MD5=y"); +#endif +#ifdef AUTH_CYRUS_SASL + read_macro_assignment("_HAVE_AUTH_CYRUS_SASL=y"); +#endif +#ifdef AUTH_DOVECOT + read_macro_assignment("_HAVE_AUTH_DOVECOT=y"); +#endif +#ifdef AUTH_GSASL + read_macro_assignment("_HAVE_AUTH_GSASL=y"); +#endif +#ifdef AUTH_HEIMDAL_GSSAPI + read_macro_assignment("_HAVE_AUTH_HEIMDAL_GSSAPI=y"); +#endif +#ifdef AUTH_PLAINTEXT + read_macro_assignment("_HAVE_AUTH_PLAINTEXT=y"); +#endif +#ifdef AUTH_SPA + read_macro_assignment("_HAVE_AUTH_SPA=y"); +#endif +#ifdef AUTH_TLS + read_macro_assignment("_HAVE_AUTH_TLS=y"); +#endif + +#ifdef ROUTER_ACCEPT + read_macro_assignment("_HAVE_RTR_ACCEPT=y"); +#endif +#ifdef ROUTER_DNSLOOKUP + read_macro_assignment("_HAVE_RTR_DNSLOOKUP=y"); +#endif +#ifdef ROUTER_IPLITERAL + read_macro_assignment("_HAVE_RTR_IPLITERAL=y"); +#endif +#ifdef ROUTER_IPLOOKUP + read_macro_assignment("_HAVE_RTR_IPLOOKUP=y"); +#endif +#ifdef ROUTER_MANUALROUTE + read_macro_assignment("_HAVE_RTR_MANUALROUTE=y"); +#endif +#ifdef ROUTER_QUERYPROGRAM + read_macro_assignment("_HAVE_RTR_QUERYPROGRAM=y"); +#endif +#ifdef ROUTER_REDIRECT + read_macro_assignment("_HAVE_RTR_REDRCT=y"); +#endif + +#ifdef TRANSPORT_APPENDFILE + read_macro_assignment("_HAVE_TPT_APPENDFILE=y"); +# ifdef SUPPORT_MAILDIR + read_macro_assignment("_HAVE_TPT_APPEND_MAILDR=y"); +# endif +# ifdef SUPPORT_MAILSTORE + read_macro_assignment("_HAVE_TPT_APPEND_MAILSTORE=y"); +# endif +# ifdef SUPPORT_MBX + read_macro_assignment("_HAVE_TPT_APPEND_MBX=y"); +# endif +#endif +#ifdef TRANSPORT_AUTOREPLY + read_macro_assignment("_HAVE_TPT_AUTOREPLY=y"); +#endif +#ifdef TRANSPORT_LMTP + read_macro_assignment("_HAVE_TPT_LMTP=y"); +#endif +#ifdef TRANSPORT_PIPE + read_macro_assignment("_HAVE_TPT_PIPE=y"); +#endif +#ifdef TRANSPORT_SMTP + read_macro_assignment("_HAVE_TPT_SMTP=y"); +#endif +} + + /************************************************* * Read main configuration options * *************************************************/ @@ -3039,6 +3267,9 @@ struct stat statbuf; uschar *s, *filename; const uschar *list = config_main_filelist; +/* First create compile-time feature macros */ +readconf_features(); + /* Loop through the possible file names */ while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)) diff --git a/test/README b/test/README index 5d9bed72d..8df1678b6 100644 --- a/test/README +++ b/test/README @@ -125,7 +125,7 @@ In order to run this test suite, the following requirements must be met: DISABLE_D_OPTION must not be used. If ALT_CONFIG_PREFIX is used, it must contain the directory of the test-suite. WHITELIST_D_MACROS should contain: - DIR:EXIM_PATH:AA:ACL:ACLRCPT:ACL_MAIL:ACL_PREDATA:ACL_RCPT:AFFIX:ALLOW:ARG1:ARG2:AUTHF:AUTHS:AUTH_ID_DOMAIN:BAD:BANNER:BB:BR:BRB:CERT:COM:COMMAND_USER:CONNECTCOND:CONTROL:CREQCIP:CREQMAC:CRL:CSS:D6:DATA:DCF:DDF:DEFAULTDWC:DELAY:DETAILS:DRATELIMIT:DYNAMIC_OPTION:ELI:ERROR_DETAILS:ERT:FAKE:FALLBACK:FILTER:FILTER_PREPEND_HOME:FORBID:FORBID_SMTP_CODE:FUSER:HAI:HAP:HARDLIMIT:HEADER_LINE_MAXSIZE:HEADER_MAXSIZE:HELO_MSG:HL:HOSTS:HOSTS_AVOID_TLS:HOSTS_MAX_TRY:HVH:IFACE:IGNORE_QUOTA:INC:INSERT:IP1:IP2:LAST:LDAPSERVERS:LENCHECK:LIMIT:LIST:LOG_SELECTOR:LS:MAXNM:MESSAGE_LOGS:MSIZE:NOTDAEMON:ONCE:ONLY:OPT:OPTION:ORDER:PAH:PEX:PORT:PTBC:QDG:QOLL:QUOTA:QUOTA_FILECOUNT:QWM:RCPT_MSG:REMEMBER:REQUIRE:RETRY:RETRY1:RETRY2:RETURN:RETURN_ERROR_DETAILS:REWRITE:ROUTE_DATA:RRATELIMIT:RT:S:SELECTOR:SELF:SERVER:SERVERS:SREQCIP:SREQMAC:SRV:STD:STRICT:SUB:SUBMISSION_OPTIONS:TIMEOUTDEFER:TIMES:TRUSTED:TRYCLEAR:UL:USE_SENDER:UTF8:VALUE:WMF:X:Y + DIR:EXIM_PATH:AA:ACL:ACLRCPT:ACL_MAIL:ACL_PREDATA:ACL_RCPT:AFFIX:ALLOW:ARG1:ARG2:AUTHF:AUTHS:AUTH_ID_DOMAIN:BAD:BANNER:BB:BR:BRB:CERT:COM:COMMAND_USER:CONNECTCOND:CONTROL:CREQCIP:CREQMAC:CRL:CSS:D6:DATA:DCF:DDF:DEFAULTDWC:DELAY:DETAILS:DRATELIMIT:DYNAMIC_OPTION:ELI:ERROR_DETAILS:ERT:FAKE:FALLBACK:FILTER:FILTER_PREPEND_HOME:FORBID:FORBID_SMTP_CODE:FUSER:HAI:HAP:HARDLIMIT:HEADER_LINE_MAXSIZE:HEADER_MAXSIZE:HELO_MSG:HL:HOSTS:HOSTS_AVOID_TLS:HOSTS_MAX_TRY:HVH:IFACE:IGNORE_QUOTA:INC:INSERT:IP1:IP2:LAST:LDAPSERVERS:LENCHECK:LIMIT:LIST:LOG_SELECTOR:MAXNM:MESSAGE_LOGS:MSIZE:NOTDAEMON:ONCE:ONLY:OPT:OPTION:ORDER:PAH:PEX:PORT:PTBC:QDG:QOLL:QUOTA:QUOTA_FILECOUNT:QWM:RCPT_MSG:REMEMBER:REQUIRE:RETRY:RETRY1:RETRY2:RETURN:RETURN_ERROR_DETAILS:REWRITE:ROUTE_DATA:RRATELIMIT:SELECTOR:SELF:SERVER:SERVERS:SREQCIP:SREQMAC:SRV:STRICT:SUB:SUBMISSION_OPTIONS:TIMEOUTDEFER:TIMES:TRUSTED:TRYCLEAR:UL:USE_SENDER:UTF8:VALUE:WMF (10) Exim must *not* be built with USE_READLINE, as the test-suite's automation assumes the simpler I/O model. diff --git a/test/confs/0230 b/test/confs/0230 index d9cecf3d4..c26b45758 100644 --- a/test/confs/0230 +++ b/test/confs/0230 @@ -32,7 +32,7 @@ check_recipient: begin routers -.ifdef RT +.ifdef OPT to_server: driver = manualroute transport = remote diff --git a/test/confs/0290 b/test/confs/0290 index e7c501c91..5ccb8451f 100644 --- a/test/confs/0290 +++ b/test/confs/0290 @@ -3,7 +3,7 @@ FOOBAR= FOO=inc1 BAR=.include "DIR/aux-fixed/TESTNUM.inc2" -RT = receive_timeout = 1s +OPT = receive_timeout = 1s INC= C1=# @@ -18,7 +18,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- FOOBAR .include DIR/aux-fixed/TESTNUM.FOO -RT +OPT INC remote_sort_domains = a:b:c diff --git a/test/confs/0465 b/test/confs/0465 index 45ec3314e..9fc5579df 100644 --- a/test/confs/0465 +++ b/test/confs/0465 @@ -1,6 +1,6 @@ # Exim test configuration 0465 -STD= +OPT= .include DIR/aux-var/std_conf_prefix @@ -12,7 +12,7 @@ acl_smtp_rcpt = accept acl_smtp_data = check_data queue_only trusted_users = CALLER -STD +OPT begin acl diff --git a/test/confs/0551 b/test/confs/0551 index b37b74cf7..1b4465bdd 100644 --- a/test/confs/0551 +++ b/test/confs/0551 @@ -1,6 +1,6 @@ # Exim test configuration 0551 -LS=+pid +LOG_SELECTOR=+pid .include DIR/aux-var/std_conf_prefix @@ -8,7 +8,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- -log_selector = LS +log_selector = LOG_SELECTOR # ----- Routers ----- diff --git a/test/confs/0557 b/test/confs/0557 index 5c944e9cd..9b7dec2e6 100644 --- a/test/confs/0557 +++ b/test/confs/0557 @@ -1,7 +1,7 @@ # Exim test configuration 0557 -X= -Y= +FAKE= +OPT= HOSTS= HAI= @@ -19,8 +19,8 @@ begin routers r1: driver = manualroute route_list = * HOSTS -X host_find_failed = ignore -Y host_all_ignored = HAI +FAKE host_find_failed = ignore +OPT host_all_ignored = HAI no_more self = send transport = t1 diff --git a/test/confs/0900 b/test/confs/0900 index 2eaf01ee3..21fbf0901 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -1,6 +1,6 @@ # Exim test configuration 0900 SERVER= -Y= +SRV= LIST= ALLOW= @@ -12,7 +12,7 @@ log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME chunking_advertise_hosts = * -tls_advertise_hosts = ${if eq {Y}{tls} {*}} +tls_advertise_hosts = ${if eq {SRV}{tls} {*}} # ----- Main settings ----- diff --git a/test/confs/3414 b/test/confs/3414 index 64c3cf48a..5d0f93c46 100644 --- a/test/confs/3414 +++ b/test/confs/3414 @@ -1,7 +1,7 @@ # Exim test configuration 3414 ACL= -S= +OPT= exim_path = EXIM_PATH keep_environment = @@ -17,7 +17,7 @@ tls_advertise_hosts = # ----- Main settings ----- acl_smtp_mail = mail -S acl_smtp_mailauth=ACL +OPT acl_smtp_mailauth=ACL # ----- ACLs ----- diff --git a/test/confs/5600 b/test/confs/5600 index a15936d83..b65a2797e 100644 --- a/test/confs/5600 +++ b/test/confs/5600 @@ -27,7 +27,7 @@ tls_verify_hosts = HOSTIPV4 tls_try_verify_hosts = * tls_verify_certificates = DIR/aux-fixed/cert2 tls_crl = CRL -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ diff --git a/test/confs/5601 b/test/confs/5601 index 788f509a9..3309870a3 100644 --- a/test/confs/5601 +++ b/test/confs/5601 @@ -39,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\ {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\ fail} -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ diff --git a/test/confs/5740 b/test/confs/5740 index 2f0fc25c5..ccc907c82 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -39,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\ {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\ fail} -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ diff --git a/test/scripts/0000-Basic/0230 b/test/scripts/0000-Basic/0230 index b62e31355..92ef10c51 100644 --- a/test/scripts/0000-Basic/0230 +++ b/test/scripts/0000-Basic/0230 @@ -67,7 +67,7 @@ quit # exim -DSERVER=server -bd -oX PORT_D **** -sudo exim -DRT -bs -oMa V4NET.9.8.7.1225 +sudo exim -DOPT -bs -oMa V4NET.9.8.7.1225 mail from: rcpt to: data @@ -75,7 +75,7 @@ this is a message . quit **** -exim -DRT -odi -qf +exim -DOPT -odi -qf **** # # diff --git a/test/scripts/0000-Basic/0290 b/test/scripts/0000-Basic/0290 index f2d69e1d0..f4b63aa8e 100644 --- a/test/scripts/0000-Basic/0290 +++ b/test/scripts/0000-Basic/0290 @@ -1,11 +1,11 @@ # .include and macro tests exim -bP local_interfaces message_size_limit recipients_max remote_sort_domains receive_timeout **** -exim -DRT= -bP receive_timeout +exim -DOPT= -bP receive_timeout **** -exim -DRT -bP receive_timeout +exim -DOPT -bP receive_timeout **** -exim '-D RT = receive_timeout = 4s ' -bP receive_timeout +exim '-D OPT = receive_timeout = 4s ' -bP receive_timeout **** 1 exim -DINC='.include non/absolute' -bP receive_timeout diff --git a/test/scripts/0000-Basic/0465 b/test/scripts/0000-Basic/0465 index 03abe164f..de8b6cbdf 100644 --- a/test/scripts/0000-Basic/0465 +++ b/test/scripts/0000-Basic/0465 @@ -7,7 +7,7 @@ quit 1 exim -f abc@somewhere. xxx **** -exim -DSTD=strip_trailing_dot -d -bs +exim -DOPT=strip_trailing_dot -d -bs mail from:<> rcpt to: data @@ -15,7 +15,7 @@ To: abc@domain. . quit **** -exim -DSTD=strip_trailing_dot -f abc@somewhere. xxx@yyy. +exim -DOPT=strip_trailing_dot -f abc@somewhere. xxx@yyy. **** exim -d -bs mail from:<> diff --git a/test/scripts/0000-Basic/0551 b/test/scripts/0000-Basic/0551 index afd5c9b05..d11064c00 100644 --- a/test/scripts/0000-Basic/0551 +++ b/test/scripts/0000-Basic/0551 @@ -6,7 +6,7 @@ Message 1 exim -odi userx@test.ex userz@test.ex Message 2 **** -exim -DLS= -odi userx@test.ex +exim -DLOG_SELECTOR= -odi userx@test.ex Message 3 **** exigrep userx diff --git a/test/scripts/0000-Basic/0557 b/test/scripts/0000-Basic/0557 index 8e05b4719..02ab466d2 100644 --- a/test/scripts/0000-Basic/0557 +++ b/test/scripts/0000-Basic/0557 @@ -1,16 +1,16 @@ # host_find_failed=ignore 1 -exim -DX=# -DY=# -bt userx@test.ex +exim -DFAKE=# -DOPT=# -bt userx@test.ex **** 1 -exim -DY=# -DHOSTS=a.non.exist -bt userx@test.ex +exim -DOPT=# -DHOSTS=a.non.exist -bt userx@test.ex **** 1 -exim -DY=# -DHOSTS=a.non.exist:b.non.exist -bt userx@test.ex +exim -DOPT=# -DHOSTS=a.non.exist:b.non.exist -bt userx@test.ex **** -exim -DY=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@test.ex +exim -DOPT=# -DHOSTS=a.non.exist:127.0.0.1 -bt userx@test.ex **** -exim -DY=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@test.ex +exim -DOPT=# -DHOSTS=127.0.0.1:b.non.exist:127.0.0.2 -bt userx@test.ex **** 1 exim -DHOSTS=a.non.exist -DHAI=defer -bt userx@test.ex diff --git a/test/scripts/2000-GnuTLS/2090 b/test/scripts/2000-GnuTLS/2090 index 55dc1fae9..278f03429 100644 --- a/test/scripts/2000-GnuTLS/2090 +++ b/test/scripts/2000-GnuTLS/2090 @@ -1,6 +1,6 @@ # TLS server, CHUNKING reception gnutls -exim -DSERVER=server -DY=tls -bd -oX PORT_D +exim -DSERVER=server -DSRV=tls -bd -oX PORT_D **** # # non-piplined diff --git a/test/scripts/2000-GnuTLS/2091 b/test/scripts/2000-GnuTLS/2091 index aa7b26058..d20f8076c 100644 --- a/test/scripts/2000-GnuTLS/2091 +++ b/test/scripts/2000-GnuTLS/2091 @@ -1,6 +1,6 @@ # TLS client, CHUNKING transmission gnutls -exim -DSERVER=server -DY=tls -bd -oX PORT_S +exim -DSERVER=server -DSRV=tls -bd -oX PORT_S **** exim -odf CALLER@test.ex Test message. Contains FF: ÿ diff --git a/test/scripts/2100-OpenSSL/2190 b/test/scripts/2100-OpenSSL/2190 index 708a36e71..54095d49a 100644 --- a/test/scripts/2100-OpenSSL/2190 +++ b/test/scripts/2100-OpenSSL/2190 @@ -1,5 +1,5 @@ # TLS server, CHUNKING reception -exim -DSERVER=server -DY=tls -bd -oX PORT_D +exim -DSERVER=server -DSRV=tls -bd -oX PORT_D **** # # non-piplined diff --git a/test/scripts/2100-OpenSSL/2191 b/test/scripts/2100-OpenSSL/2191 deleted file mode 120000 index 825b021c3..000000000 --- a/test/scripts/2100-OpenSSL/2191 +++ /dev/null @@ -1 +0,0 @@ -../2000-GnuTLS/2091 \ No newline at end of file diff --git a/test/scripts/2100-OpenSSL/2191 b/test/scripts/2100-OpenSSL/2191 new file mode 100644 index 000000000..6c1810416 --- /dev/null +++ b/test/scripts/2100-OpenSSL/2191 @@ -0,0 +1,8 @@ +# TLS client, CHUNKING transmission +exim -DSERVER=server -DSRV=tls -bd -oX PORT_S +**** +exim -odf CALLER@test.ex +Test message. Contains FF: ÿ +**** +killdaemon +no_msglog_check diff --git a/test/scripts/3400-plaintext/3414 b/test/scripts/3400-plaintext/3414 index 37528f2ea..edd3a011f 100644 --- a/test/scripts/3400-plaintext/3414 +++ b/test/scripts/3400-plaintext/3414 @@ -1,5 +1,5 @@ # control of AUTH= on MAIL by ACL -exim -DS=# -bs +exim -DOPT=# -bs ehlo xxxx mail from: auth=c@d quit @@ -15,7 +15,7 @@ mail from: auth=c@d quit **** # No acl_smtp_mailauth, but authenticated -exim -DS=# -bs +exim -DOPT=# -bs ehlo xxxx auth plain abcd mail from: auth=c@d diff --git a/test/scripts/5600-OCSP-OpenSSL/5600 b/test/scripts/5600-OCSP-OpenSSL/5600 index aa3e3fb19..72fa478e3 100644 --- a/test/scripts/5600-OCSP-OpenSSL/5600 +++ b/test/scripts/5600-OCSP-OpenSSL/5600 @@ -5,7 +5,7 @@ # '1: Server sends good staple on request' # exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp **** client-ssl \ -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \ @@ -34,7 +34,7 @@ killdaemon # '2: Server does not staple an outdated response' # exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp **** # XXX test sequence might not be quite right; this is for a server refusal # and we're expecting a client refusal. @@ -59,7 +59,7 @@ killdaemon # '3: Server does not staple a response for a revoked cert' # exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp **** client-ssl \ -ocsp aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem \ @@ -84,7 +84,7 @@ killdaemon # '4: Connection functions when server is prepared to staple but client does not request it' # exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp **** # client-ssl \ diff --git a/test/scripts/5600-OCSP-OpenSSL/5601 b/test/scripts/5600-OCSP-OpenSSL/5601 index 4bdf696c2..ddcdeed9b 100644 --- a/test/scripts/5600-OCSP-OpenSSL/5601 +++ b/test/scripts/5600-OCSP-OpenSSL/5601 @@ -2,7 +2,7 @@ # # # Client works when we request but don't require OCSP stapling and none comes -exim -bd -oX PORT_D -DSERVER=server -DOCSP=/dev/null +exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null **** exim norequire@test.ex test message. @@ -15,7 +15,7 @@ killdaemon # # Client works when we don't request OCSP stapling exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp **** exim nostaple@test.ex test message. @@ -35,7 +35,7 @@ killdaemon # # # Client fails on lack of required stapled info -exim -bd -oX PORT_D -DSERVER=server -DOCSP=/dev/null +exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null **** exim CALLER@test.ex test message. @@ -48,7 +48,7 @@ sudo rm spool/db/retry # # Client fails on revoked stapled info EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp **** exim CALLER@test.ex test message. @@ -63,7 +63,7 @@ sudo rm spool/db/retry # # Client fails on expired stapled info EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp **** exim CALLER@test.ex test message. diff --git a/test/scripts/5740-OCSP-OpenSSL-events/5740 b/test/scripts/5740-OCSP-OpenSSL-events/5740 index 992027eb4..43c545afa 100644 --- a/test/scripts/5740-OCSP-OpenSSL-events/5740 +++ b/test/scripts/5740-OCSP-OpenSSL-events/5740 @@ -3,7 +3,7 @@ # # # Client works when we request but don't require OCSP stapling and none comes -exim -bd -oX PORT_D -DSERVER=server -DOCSP=/dev/null +exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null **** exim norequire@test.ex test message. @@ -16,7 +16,7 @@ killdaemon # # Client works when we request but don't require OCSP stapling and some arrives exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.good.resp **** exim norequire@test.ex test message. @@ -45,7 +45,7 @@ killdaemon # # # Client fails on lack of required stapled info -exim -bd -oX PORT_D -DSERVER=server -DOCSP=/dev/null +exim -bd -oX PORT_D -DSERVER=server -DRETURN=/dev/null **** exim failrequire@test.ex test message. @@ -59,7 +59,7 @@ sudo rm -f DIR/spool/db/retry # # Client fails on revoked stapled info EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.revoked.resp **** exim failrevoked@test.ex test message. @@ -73,7 +73,7 @@ sudo rm -f DIR/spool/db/retry # # Client fails on expired stapled info EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK=y exim -bd -oX PORT_D -DSERVER=server \ - -DOCSP=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp + -DRETURN=DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.ocsp.dated.resp **** exim failexpired@test.ex test message. -- 2.25.1