diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-01-28 22:20:33 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-02-23 21:56:19 +0100 |
| commit | 43ba2742c700d625dcdcdaf7bbadc2f72776854a (patch) | |
| tree | d3daee2e99af9a5adf4e19fd6f9f52b7bf8c602a | |
| parent | fef95dbbb2220e10f5a6bf7ac1b6ecdff0025bca (diff) | |
| download | exim4-43ba2742c700d625dcdcdaf7bbadc2f72776854a.tar.gz | |
Fix CVE-2016-1531
Add keep_environment, add_environment.
Change the working directory to "/" during the early startup
phase.
(cherry picked from commit bc3c7bb7d4aba3e563434e5627fe1f2176aa18c0)
(cherry picked from commit 2b92b67bfc33efe05e6ff2ea3852731ac2273832)
(cherry picked from commit 14b82c8b736c8ed24eda144f57703cb9feac6323)
(cherry picked from commit 9ca92d0c6e9c6f161bd8111366c6952d3a9315e2)
(cherry picked from commit 0020c6d9ecfd98ed7b2b337ed4f898fdc409784b)
(cherry picked from commit e8f96966360ea8867ad6a8b5affda6c37fa4958c)
(cherry picked from commit ef6fb807c1e1a665f444f644c60c77269f7c5209)
834 files changed, 1127 insertions, 51 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index a05b41b40..6a1963043 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -3149,6 +3149,11 @@ using one of the words &%router_list%&, &%transport_list%&, or settings can be obtained by using &%routers%&, &%transports%&, or &%authenticators%&. +.cindex "environment" +If &%environment%& is given as an argument, the set of environment +variables is output, line by line. Using the &%-n%& flag supresses the value of the +variables. + .cindex "options" "macro &-- extracting" If invoked by an admin user, then &%macro%&, &%macro_list%& and &%macros%& are available, similarly to the drivers. Because macros are sometimes used @@ -3480,6 +3485,8 @@ name, but it can be a colon-separated list of names. In this case, the first file that exists is used. Failure to open an existing file stops Exim from proceeding any further along the list, and an error is generated. +The file names need to be absolute names. + When this option is used by a caller other than root, and the list is different from the compiled-in list, Exim gives up its root privilege immediately, and runs with the real and effective uid and gid set to those of the caller. @@ -7687,7 +7694,7 @@ domain, host, address and local part lists. -.section "Expansion of lists" "SECID75" +.section "Expansion of lists" "SECTlistexpand" .cindex "expansion" "of lists" Each list is expanded as a single string before it is used. The result of expansion must be a list, possibly containing empty items, which is split up @@ -13810,6 +13817,14 @@ received. See chapter &<<CHAPACL>>& for further details. This option defines the ACL that is run when an SMTP VRFY command is received. See chapter &<<CHAPACL>>& for further details. +.new +.option add_environment main "string list" empty +.cindex "environment" "inherited" +This option allows to set individual environment variables that the +currently linked libraries and programs in child processes use. The +default list is empty, +.wen + .option admin_groups main "string list&!!" unset .cindex "admin user" This option is expanded just once, at the start of Exim's processing. If the @@ -14871,6 +14886,30 @@ process rather than a remote host, and is using &%-bs%& to inject the messages, .option ignore_fromline_local main boolean false See &%ignore_fromline_hosts%& above. +.new +.option keep_environment main "string list" unset +.cindex "environment" "inherited" +This option contains a string list of environment variables to keep. +You have to trust these variables or you have to be sure that +these variables do not impose any security risk. Keep in mind that +during the startup phase Exim is running with an effective UID 0 in most +installations. As the default value is an empty list, the default +environment for using libraries, running embedded Perl code, or running +external binaries is empty, and does not not even contain PATH or HOME. + +Actually the list is interpreted as a list of patterns +(&<<SECTlistexpand>>&), except that it is not expanded first. + +WARNING: Macro substitution is still done first, so having a macro +FOO and having FOO_HOME in your &%keep_environment%& option may have +unexpected results. You may work around this using a regular expression +that does not match the macro name: ^[F]OO_HOME$. + +Current versions of Exim issue a warning during startupif you do not mention +&%keep_environment%& or &%add_environment%& in your runtime configuration +file. +.wen + .option keep_malformed main time 4d This option specifies the length of time to keep messages whose spool files @@ -15909,6 +15948,12 @@ it qualifies them only if the message came from a host that matches &%sender_unqualified_hosts%&, or if the message was submitted locally (not using TCP/IP), and the &%-bnq%& option was not set. +.option set_environment main "string list" empty +.cindex "environment" +This option allows to set individual environment variables that the +currently linked libraries and programs in child processes use. The +default list is empty, + .new .option slow_lookup_log main integer 0 diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 2c34c2176..27365beae 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -2,6 +2,7 @@ Change log file for Exim from version 4.21 ------------------------------------------- +HS/04 Add support for keep_environment and add_environment options. Exim version 4.86 ----------------- JH/01 Bug 1545: The smtp transport option "retry_include_ip_address" is now diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base index 1d5a5f6f4..81fbee0c5 100644 --- a/src/OS/Makefile-Base +++ b/src/OS/Makefile-Base @@ -317,6 +317,7 @@ OBJ_EXIM = acl.o child.o crypt16.o daemon.o dbfn.o debug.o deliver.o \ rda.o readconf.o receive.o retry.o rewrite.o rfc2047.o \ route.o search.o sieve.o smtp_in.o smtp_out.o spool_in.o spool_out.o \ std-crypto.o store.o string.o tls.o tod.o transport.o tree.o verify.o \ + environment.o \ $(OBJ_LOOKUPS) \ local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \ $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL) @@ -573,6 +574,7 @@ dns.o: $(HDRS) dns.c enq.o: $(HDRS) enq.c exim.o: $(HDRS) exim.c expand.o: $(HDRS) expand.c +environment.o: $(HDRS) environment.c filter.o: $(HDRS) filter.c filtertest.o: $(HDRS) filtertest.c globals.o: $(HDRS) globals.c diff --git a/src/scripts/MakeLinks b/src/scripts/MakeLinks index ea6265002..204bbc1d2 100755 --- a/src/scripts/MakeLinks +++ b/src/scripts/MakeLinks @@ -101,6 +101,7 @@ for f in dbfunctions.h dbstuff.h exim.h functions.h globals.h local_scan.h \ exim_dbutil.c exim_lock.c expand.c filter.c filtertest.c globals.c \ header.c host.c ip.c log.c lss.c match.c moan.c parse.c perl.c queue.c \ rda.c readconf.c receive.c retry.c rewrite.c rfc2047.c route.c search.c \ + setenv.c environment.c \ sieve.c smtp_in.c smtp_out.c spool_in.c spool_out.c std-crypto.c store.c \ string.c tls.c tlscert-gnu.c tlscert-openssl.c tls-gnu.c tls-openssl.c \ tod.c transport.c tree.c verify.c version.c dkim.c dkim.h dmarc.c dmarc.h \ diff --git a/src/src/environment.c b/src/src/environment.c new file mode 100644 index 000000000..aaa84f817 --- /dev/null +++ b/src/src/environment.c @@ -0,0 +1,54 @@ +/************************************************* +* Exim - an Internet mail transport agent * +*************************************************/ + +/* Copyright (c) Heiko Schlittermann 2016 + * hs@schlittermann.de + * See the file NOTICE for conditions of use and distribution. + */ + +#include "exim.h" + +/* The cleanup_environment() function is used during the startup phase +of the Exim process, right after reading the configurations main +part, before any expansions take place. It retains the environment +variables we trust (via the keep_environment option) and allows to +set additional variables (via add_environment). + +Returns: TRUE if successful + FALSE otherwise +*/ + +BOOL +cleanup_environment() +{ +if (!keep_environment || *keep_environment == '\0') + clearenv(); +else if (Ustrcmp(keep_environment, "*") != 0) + { + uschar **p; + if (environ) for (p = USS environ; *p; /* see below */) + { + uschar *name = string_copyn(*p, US Ustrchr(*p, '=') - *p); + + if (OK != match_isinlist(name, CUSS &keep_environment, + 0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL)) + if (unsetenv(CS name) < 0) return FALSE; + else /* nothing */; + else + p++; + + store_reset(name); + } + } +if (add_environment) + { + uschar *p; + int sep = 0; + const uschar* envlist = add_environment; + while ((p = string_nextinlist(&envlist, &sep, NULL, 0))) + putenv(CS p); + } + + return TRUE; +} diff --git a/src/src/exim.c b/src/src/exim.c index f9d57ab9c..beb5abc25 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -3723,8 +3723,19 @@ if (running_in_test_harness) smtputf8_advertise_hosts = NULL; is a failure. It leaves the configuration file open so that the subsequent configuration data for delivery can be read if needed. */ +/* To be safe: change the working directory to /. */ +if (Uchdir("/") < 0) + { + perror("exim: chdir `/': "); + exit(EXIT_FAILURE); + } + readconf_main(); +if (cleanup_environment() == FALSE) + log_write(0, LOG_PANIC_DIE, "Can't cleanup environment"); + + /* If an action on specific messages is requested, or if a daemon or queue runner is being started, we need to know if Exim was called by an admin user. This is the case if the real user is root or exim, or if the real group is @@ -3881,7 +3892,7 @@ TMPDIR macro, if this macro is defined. */ #ifdef TMPDIR { uschar **p; - for (p = USS environ; *p != NULL; p++) + if (environ) for (p = USS environ; *p != NULL; p++) { if (Ustrncmp(*p, "TMPDIR=", 7) == 0 && Ustrcmp(*p+7, TMPDIR) != 0) @@ -3921,10 +3932,10 @@ else uschar **new; uschar **newp; int count = 0; - while (*p++ != NULL) count++; + if (environ) while (*p++ != NULL) count++; if (envtz == NULL) count++; newp = new = malloc(sizeof(uschar *) * (count + 1)); - for (p = USS environ; *p != NULL; p++) + if (environ) for (p = USS environ; *p != NULL; p++) { if (Ustrncmp(*p, "TZ=", 3) == 0) continue; *newp++ = *p; @@ -4514,7 +4525,8 @@ if (list_options) (Ustrcmp(argv[i], "router") == 0 || Ustrcmp(argv[i], "transport") == 0 || Ustrcmp(argv[i], "authenticator") == 0 || - Ustrcmp(argv[i], "macro") == 0)) + Ustrcmp(argv[i], "macro") == 0 || + Ustrcmp(argv[i], "environment") == 0)) { readconf_print(argv[i+1], argv[i], flag_n); i++; diff --git a/src/src/functions.h b/src/src/functions.h index 02579040e..8ddf848f2 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -104,6 +104,7 @@ extern int check_host(void *, const uschar *, const uschar **, uschar **); extern uschar **child_exec_exim(int, BOOL, int *, BOOL, int, ...); extern pid_t child_open_uid(const uschar **, const uschar **, int, uid_t *, gid_t *, int *, int *, uschar *, BOOL); +extern BOOL cleanup_environment(void); extern uschar *cutthrough_finaldot(void); extern BOOL cutthrough_flush_send(void); extern BOOL cutthrough_headers_send(void); @@ -408,6 +409,7 @@ extern uschar *string_append_listele(uschar *, uschar, const uschar *); extern uschar *string_append_listele_n(uschar *, uschar, const uschar *, unsigned); extern uschar *string_base62(unsigned long int); extern uschar *string_cat(uschar *, int *, int *, const uschar *, int); +extern int string_compare_by_pointer(const uschar **, const uschar **); extern uschar *string_copy_dnsdomain(uschar *); extern uschar *string_copy_malloc(const uschar *); extern uschar *string_copylc(const uschar *); diff --git a/src/src/globals.c b/src/src/globals.c index 66baffe45..1dbc015f0 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -320,6 +320,7 @@ BOOL active_local_from_check = FALSE; BOOL active_local_sender_retain = FALSE; int body_8bitmime = 0; BOOL accept_8bitmime = TRUE; /* deliberately not RFC compliant */ +uschar *add_environment = NULL; address_item *addr_duplicate = NULL; address_item address_defaults = { @@ -789,6 +790,8 @@ uschar *iterate_item = NULL; int journal_fd = -1; +uschar *keep_environment = NULL; + int keep_malformed = 4*24*60*60; /* 4 days */ uschar *eldap_dn = NULL; diff --git a/src/src/globals.h b/src/src/globals.h index ab03302bb..f3e884b8e 100644 --- a/src/src/globals.h +++ b/src/src/globals.h @@ -156,6 +156,7 @@ extern const uschar **address_expansions[ADDRESS_EXPANSIONS_COUNT]; /* General global variables */ extern BOOL accept_8bitmime; /* Allow *BITMIME incoming */ +extern uschar *add_environment; /* List of environment variables to add */ extern int body_8bitmime; /* sender declared BODY= ; 7=7BIT, 8=8BITMIME */ extern header_line *acl_added_headers; /* Headers added by an ACL */ extern tree_node *acl_anchor; /* Tree of named ACLs */ @@ -512,6 +513,7 @@ extern uschar *iterate_item; /* Item from iterate list */ extern int journal_fd; /* Fd for journal file */ +extern uschar *keep_environment; /* Whitelist for environment variables */ extern int keep_malformed; /* Time to keep malformed messages */ extern uschar *eldap_dn; /* Where LDAP DNs are left */ diff --git a/src/src/readconf.c b/src/src/readconf.c index 8a62d0245..9f6954cf0 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -165,6 +165,7 @@ static optionlist optionlist_config[] = { { "acl_smtp_starttls", opt_stringptr, &acl_smtp_starttls }, #endif { "acl_smtp_vrfy", opt_stringptr, &acl_smtp_vrfy }, + { "add_environment", opt_stringptr, &add_environment }, { "admin_groups", opt_gidlist, &admin_groups }, { "allow_domain_literals", opt_bool, &allow_domain_literals }, { "allow_mx_to_ip", opt_bool, &allow_mx_to_ip }, @@ -279,6 +280,7 @@ static optionlist optionlist_config[] = { { "ignore_bounce_errors_after", opt_time, &ignore_bounce_errors_after }, { "ignore_fromline_hosts", opt_stringptr, &ignore_fromline_hosts }, { "ignore_fromline_local", opt_bool, &ignore_fromline_local }, + { "keep_environment", opt_stringptr, &keep_environment }, { "keep_malformed", opt_time, &keep_malformed }, #ifdef LOOKUP_LDAP { "ldap_ca_cert_dir", opt_stringptr, &eldap_ca_cert_dir }, @@ -2522,6 +2524,7 @@ second argument is NULL. There are some special values: macro_list print a list of macro names +name print a named list item local_scan print the local_scan options + environment print the used execution environment If the second argument is not NULL, it must be one of "router", "transport", "authenticator" or "macro" in which case the first argument identifies the @@ -2663,6 +2666,25 @@ if (type == NULL) names_only = TRUE; } + else if (Ustrcmp(name, "environment") == 0) + { + if (environ) + { + uschar **p; + size_t n; + for (p = USS environ; *p; p++) ; + n = p - USS environ; + qsort(environ, p - USS environ, sizeof(*p), (__compar_fn_t) string_compare_by_pointer); + + for (p = USS environ; *p; p++) + { + if (no_labels) *(Ustrchr(*p, '=')) = '\0'; + puts(*p); + } + } + return; + } + else { print_ol(find_option(name, optionlist_config, optionlist_config_size), @@ -2976,6 +2998,15 @@ const uschar *list = config_main_filelist; while((filename = string_nextinlist(&list, &sep, big_buffer, big_buffer_size)) != NULL) { + + /* To avoid confusion: Exim changes to / at the very beginning and + * and to $spool_directory later. */ + if (filename[0] != '/') + { + fprintf(stderr, "-C %s: only absolute names are allowed\n", filename); + exit(EXIT_FAILURE); + } + /* Cut out all the fancy processing unless specifically wanted */ #if defined(CONFIGURE_FILE_USE_NODE) || defined(CONFIGURE_FILE_USE_EUID) @@ -3421,6 +3452,11 @@ if (gnutls_require_kx || gnutls_require_mac || gnutls_require_proto) " gnutls_require_kx, gnutls_require_mac and gnutls_require_protocols" " are obsolete\n"); #endif /*SUPPORT_TLS*/ + +if ((!add_environment || *add_environment == '\0') && !keep_environment) + log_write(0, LOG_MAIN, + "WARNING: purging the environment.\n" + " Suggested action: use keep_environment and add_environment.\n"); } diff --git a/src/src/string.c b/src/src/string.c index a3fbc4ea5..b7e7db487 100644 --- a/src/src/string.c +++ b/src/src/string.c @@ -1706,6 +1706,17 @@ return yield; #endif /* COMPILE_UTILITY */ +#ifndef COMPILE_UTILITY +/* qsort(3), currently used to sort the environment variables +for -bP environment output, needs a function to compare two pointers to string +pointers. Here it is. */ + +int +string_compare_by_pointer(const uschar **a, const uschar **b) +{ +return Ustrcmp(CUS *a, CUS *b); +} +#endif /* COMPILE_UTILITY */ diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c index e1dcd77bc..01394c58d 100644 --- a/src/src/tls-openssl.c +++ b/src/src/tls-openssl.c @@ -855,7 +855,7 @@ bad: { extern char ** environ; uschar ** p; - for (p = USS environ; *p != NULL; p++) + if (environ) for (p = USS environ; *p != NULL; p++) if (Ustrncmp(*p, "EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK", 42) == 0) { DEBUG(D_tls) debug_printf("Supplying known bad OCSP response\n"); diff --git a/test/confs/0000 b/test/confs/0000 index 25474a063..226ffc3f0 100644 --- a/test/confs/0000 +++ b/test/confs/0000 @@ -3,10 +3,10 @@ # This configuration is used when the test script is finding out what features # are in the Exim binary. It needs to discover where the test suite's spool # directory is going to be. - spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" gecos_name = CALLER_NAME +keep_environment = # End diff --git a/test/confs/0001 b/test/confs/0001 index ab9ad45f2..9d711a2d1 100644 --- a/test/confs/0001 +++ b/test/confs/0001 @@ -5,6 +5,7 @@ # mess up the creation of the spool directory etc. exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0002 b/test/confs/0002 index a6a1581d9..819287dd5 100644 --- a/test/confs/0002 +++ b/test/confs/0002 @@ -4,6 +4,7 @@ LENCHECK= PTBC= exim_path = EXIM_PATH +keep_environment = USER host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0003 b/test/confs/0003 index 5c1382c7c..048856789 100644 --- a/test/confs/0003 +++ b/test/confs/0003 @@ -1,6 +1,7 @@ # Exim test configuration 0003 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0004 b/test/confs/0004 index 5db3d6a2a..5af05e39d 100644 --- a/test/confs/0004 +++ b/test/confs/0004 @@ -1,6 +1,7 @@ # Exim test configuration 0004 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0005 b/test/confs/0005 index f7d5b8027..0e096d8dc 100644 --- a/test/confs/0005 +++ b/test/confs/0005 @@ -1,6 +1,7 @@ # Exim test configuration 0005 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0006 b/test/confs/0006 index e85bb4ec4..fdb6c228d 100644 --- a/test/confs/0006 +++ b/test/confs/0006 @@ -1,6 +1,7 @@ # Exim test configuration 0006 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0007 b/test/confs/0007 index 5e01e1de2..30e534cd5 100644 --- a/test/confs/0007 +++ b/test/confs/0007 @@ -1,6 +1,7 @@ # Exim test configuration 0007 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0008 b/test/confs/0008 index bf2d5b0ea..91290b74e 100644 --- a/test/confs/0008 +++ b/test/confs/0008 @@ -1,6 +1,7 @@ # Exim test configuration 0008 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0009 b/test/confs/0009 index 2049f10e1..271e3d011 100644 --- a/test/confs/0009 +++ b/test/confs/0009 @@ -1,6 +1,7 @@ # Exim test configuration 0009 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0010 b/test/confs/0010 index 466b97c35..8b9b43e53 100644 --- a/test/confs/0010 +++ b/test/confs/0010 @@ -1,6 +1,7 @@ # Exim test configuration 0010 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0011 b/test/confs/0011 index 36aa77762..11852d609 100644 --- a/test/confs/0011 +++ b/test/confs/0011 @@ -1,6 +1,7 @@ # Exim test configuration 0011 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0012 b/test/confs/0012 index f554c9f15..b043b3036 100644 --- a/test/confs/0012 +++ b/test/confs/0012 @@ -1,6 +1,7 @@ # Exim test configuration 0012 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0013 b/test/confs/0013 index 08f976a25..0241662bb 100644 --- a/test/confs/0013 +++ b/test/confs/0013 @@ -1,6 +1,7 @@ # Exim test configuration 0013 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0014 b/test/confs/0014 index 9785f5fe1..b9e5222b9 100644 --- a/test/confs/0014 +++ b/test/confs/0014 @@ -1,6 +1,7 @@ # Exim test configuration 0014 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0015 b/test/confs/0015 index e5637556b..a41692d19 100644 --- a/test/confs/0015 +++ b/test/confs/0015 @@ -1,6 +1,7 @@ # Exim test configuration 0015 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0016 b/test/confs/0016 index 5d9d99fdb..eaecfe576 100644 --- a/test/confs/0016 +++ b/test/confs/0016 @@ -1,6 +1,7 @@ # Exim test configuration 0016 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0017 b/test/confs/0017 index 9a9c2003d..76922322c 100644 --- a/test/confs/0017 +++ b/test/confs/0017 @@ -1,6 +1,7 @@ # Exim test configuration 0017 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0018 b/test/confs/0018 index 170a4c1c2..24e9ae3ac 100644 --- a/test/confs/0018 +++ b/test/confs/0018 @@ -1,6 +1,7 @@ # Exim test configuration 0018 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0019 b/test/confs/0019 index 6143a4d22..4fcf13d80 100644 --- a/test/confs/0019 +++ b/test/confs/0019 @@ -1,6 +1,7 @@ # Exim test configuration 2409 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0020 b/test/confs/0020 index 14fadcd77..e0c99ecd2 100644 --- a/test/confs/0020 +++ b/test/confs/0020 @@ -1,6 +1,7 @@ # Exim test configuration 0020 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0021 b/test/confs/0021 index 96dccd4af..81da0554a 100644 --- a/test/confs/0021 +++ b/test/confs/0021 @@ -4,6 +4,7 @@ SERVER= BR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0022 b/test/confs/0022 index 38a844cc9..1415a505b 100644 --- a/test/confs/0022 +++ b/test/confs/0022 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0023 b/test/confs/0023 index 2ee1d538b..020a1459a 100644 --- a/test/confs/0023 +++ b/test/confs/0023 @@ -3,6 +3,7 @@ LOG_SELECTOR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0024 b/test/confs/0024 index a70197579..d62fb49b3 100644 --- a/test/confs/0024 +++ b/test/confs/0024 @@ -1,6 +1,7 @@ # Exim test configuration 0024 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0025 b/test/confs/0025 index f17e0d5b2..1bae53495 100644 --- a/test/confs/0025 +++ b/test/confs/0025 @@ -1,6 +1,7 @@ # Exim test configuration 0025 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0026 b/test/confs/0026 index d9c939d58..af2661671 100644 --- a/test/confs/0026 +++ b/test/confs/0026 @@ -1,6 +1,7 @@ # Exim test configuration 0026 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0027 b/test/confs/0027 index 36116e863..ae1ff56cb 100644 --- a/test/confs/0027 +++ b/test/confs/0027 @@ -1,6 +1,7 @@ # Exim test configuration 0027 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0028 b/test/confs/0028 index 23d6c935d..7ece2503f 100644 --- a/test/confs/0028 +++ b/test/confs/0028 @@ -1,6 +1,7 @@ # Exim test configuration 0028 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0029 b/test/confs/0029 index 353415c08..a8d90ccde 100644 --- a/test/confs/0029 +++ b/test/confs/0029 @@ -1,6 +1,7 @@ # Exim test configuration 0029 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0030 b/test/confs/0030 index c2ba7ab4f..7f867c91e 100644 --- a/test/confs/0030 +++ b/test/confs/0030 @@ -1,6 +1,7 @@ # Exim test configuration 0030 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0031 b/test/confs/0031 index d4452ac3a..0d21d1889 100644 --- a/test/confs/0031 +++ b/test/confs/0031 @@ -1,6 +1,7 @@ # Exim test configuration 0031 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0032 b/test/confs/0032 index 9d2a0255b..b8dfb967b 100644 --- a/test/confs/0032 +++ b/test/confs/0032 @@ -1,6 +1,7 @@ # Exim test configuration 0032 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0033 b/test/confs/0033 index aef4591e9..ee720b2c1 100644 --- a/test/confs/0033 +++ b/test/confs/0033 @@ -1,6 +1,7 @@ # Exim test configuration 0033 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0034 b/test/confs/0034 index 8317a0cd2..8ccabc8f8 100644 --- a/test/confs/0034 +++ b/test/confs/0034 @@ -1,6 +1,7 @@ # Exim test configuration 0034 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0035 b/test/confs/0035 index a591b7521..b0e44fd80 100644 --- a/test/confs/0035 +++ b/test/confs/0035 @@ -4,6 +4,7 @@ SERVER= SUBMISSION_OPTIONS= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0036 b/test/confs/0036 index 218de7b4c..93dea8c7b 100644 --- a/test/confs/0036 +++ b/test/confs/0036 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0037 b/test/confs/0037 index 84385f07a..402cf4fd5 100644 --- a/test/confs/0037 +++ b/test/confs/0037 @@ -3,6 +3,7 @@ FILTER_PREPEND_HOME= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0038 b/test/confs/0038 index 6c4c332ae..b093d7abd 100644 --- a/test/confs/0038 +++ b/test/confs/0038 @@ -5,6 +5,7 @@ DRATELIMIT=0/1h/per_byte/strict ACLRCPT=check_rcpt exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0039 b/test/confs/0039 index 36a7d509b..81c9a5a29 100644 --- a/test/confs/0039 +++ b/test/confs/0039 @@ -3,6 +3,7 @@ QDG= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0040 b/test/confs/0040 index c686bcc02..1c94ff8bf 100644 --- a/test/confs/0040 +++ b/test/confs/0040 @@ -1,6 +1,7 @@ # Exim test configuration 0040 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0041 b/test/confs/0041 index 996e322e7..d20686f40 100644 --- a/test/confs/0041 +++ b/test/confs/0041 @@ -1,6 +1,7 @@ # Exim test configuration 0041 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0042 b/test/confs/0042 index 8a3847420..f24e2e8c1 100644 --- a/test/confs/0042 +++ b/test/confs/0042 @@ -1,6 +1,7 @@ # Exim test configuration 0042 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0043 b/test/confs/0043 index 301bee438..b4cbc9593 100644 --- a/test/confs/0043 +++ b/test/confs/0043 @@ -1,6 +1,7 @@ # Exim test configuration 0043 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0044 b/test/confs/0044 index 922944341..8cdd80368 100644 --- a/test/confs/0044 +++ b/test/confs/0044 @@ -1,6 +1,7 @@ # Exim test configuration 0044 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0045 b/test/confs/0045 index f60aec0ec..862ca6385 100644 --- a/test/confs/0045 +++ b/test/confs/0045 @@ -1,6 +1,7 @@ # Exim test configuration 0045 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0046 b/test/confs/0046 index 3c70acc52..2b9a51ccc 100644 --- a/test/confs/0046 +++ b/test/confs/0046 @@ -3,6 +3,7 @@ NL=FALSE exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0047 b/test/confs/0047 index 1e59305b6..1bab20b48 100644 --- a/test/confs/0047 +++ b/test/confs/0047 @@ -1,6 +1,7 @@ # Exim test configuration 0047 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0048 b/test/confs/0048 index 374dbaf88..b6e1c5f13 100644 --- a/test/confs/0048 +++ b/test/confs/0048 @@ -3,6 +3,7 @@ MESSAGE_LOGS = true exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0049 b/test/confs/0049 index e2b7279e0..c35c3b276 100644 --- a/test/confs/0049 +++ b/test/confs/0049 @@ -1,6 +1,7 @@ # Exim test configuration 0049 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0050 b/test/confs/0050 index 8bcfdbab0..c56849fbb 100644 --- a/test/confs/0050 +++ b/test/confs/0050 @@ -1,6 +1,7 @@ # Exim test configuration 0050 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0051 b/test/confs/0051 index 8e11e7177..588c0bebf 100644 --- a/test/confs/0051 +++ b/test/confs/0051 @@ -1,6 +1,7 @@ # Exim test configuration 0051 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0052 b/test/confs/0052 index 34c05989b..526530fca 100644 --- a/test/confs/0052 +++ b/test/confs/0052 @@ -1,6 +1,7 @@ # Exim test configuration 0052 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0053 b/test/confs/0053 index 646eee96f..1c8b2a7d5 100644 --- a/test/confs/0053 +++ b/test/confs/0053 @@ -1,6 +1,7 @@ # Exim test configuration 0053 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0054 b/test/confs/0054 index 1a0ddd3c6..ea7f571e8 100644 --- a/test/confs/0054 +++ b/test/confs/0054 @@ -1,6 +1,7 @@ # Exim test configuration 0054 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0055 b/test/confs/0055 index 9f1b0087c..44e1b30ef 100644 --- a/test/confs/0055 +++ b/test/confs/0055 @@ -1,6 +1,7 @@ # Exim test configuration 0055 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0056 b/test/confs/0056 index 51fa53b27..36e79b5c0 100644 --- a/test/confs/0056 +++ b/test/confs/0056 @@ -1,6 +1,7 @@ # Exim test configuration 0056 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0057 b/test/confs/0057 index 37bb1987c..2c0c0629b 100644 --- a/test/confs/0057 +++ b/test/confs/0057 @@ -1,6 +1,7 @@ # Exim test configuration 0057 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0058 b/test/confs/0058 index f095f3713..a9889d945 100644 --- a/test/confs/0058 +++ b/test/confs/0058 @@ -1,6 +1,7 @@ # Exim test configuration 0058 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0059 b/test/confs/0059 index b21c5cab5..3a34afb36 100644 --- a/test/confs/0059 +++ b/test/confs/0059 @@ -1,6 +1,7 @@ # Exim test configuration 0059 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0060 b/test/confs/0060 index 0bf8bc4d6..97b727cc1 100644 --- a/test/confs/0060 +++ b/test/confs/0060 @@ -1,6 +1,7 @@ # Exim test configuration 0060 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0061 b/test/confs/0061 index 84d41498b..f0fd386e4 100644 --- a/test/confs/0061 +++ b/test/confs/0061 @@ -1,6 +1,7 @@ # Exim test configuration 0061 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = ten-1.test.ex spool_directory = DIR/spool diff --git a/test/confs/0062 b/test/confs/0062 index 9becb261f..b9b830d2f 100644 --- a/test/confs/0062 +++ b/test/confs/0062 @@ -1,6 +1,7 @@ # Exim test configuration 0062 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0063 b/test/confs/0063 index d45c79cef..3903ed1e9 100644 --- a/test/confs/0063 +++ b/test/confs/0063 @@ -1,6 +1,7 @@ # Exim test configuration 0063 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0064 b/test/confs/0064 index d2de32529..49c03ebc7 100644 --- a/test/confs/0064 +++ b/test/confs/0064 @@ -1,6 +1,7 @@ # Exim test configuration 0064 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0065 b/test/confs/0065 index 0f18c5ebb..743ebe01d 100644 --- a/test/confs/0065 +++ b/test/confs/0065 @@ -1,6 +1,7 @@ # Exim test configuration 0065 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0066 b/test/confs/0066 index 8143b632e..c5946ffc1 100644 --- a/test/confs/0066 +++ b/test/confs/0066 @@ -1,6 +1,7 @@ # Exim test configuration 0066 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0067 b/test/confs/0067 index 4d53f3a7e..a06137dda 100644 --- a/test/confs/0067 +++ b/test/confs/0067 @@ -1,6 +1,7 @@ # Exim test configuration 0067 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0068 b/test/confs/0068 index bc3e88d23..40b04c45e 100644 --- a/test/confs/0068 +++ b/test/confs/0068 @@ -1,6 +1,7 @@ # Exim test configuration 0068 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0069 b/test/confs/0069 index 0c28c6484..1e3afaa88 100644 --- a/test/confs/0069 +++ b/test/confs/0069 @@ -3,6 +3,7 @@ LOG_SELECTOR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0070 b/test/confs/0070 index 768f7d614..c008fdc0d 100644 --- a/test/confs/0070 +++ b/test/confs/0070 @@ -3,6 +3,7 @@ HVH= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0071 b/test/confs/0071 index 749781c78..b0c491099 100644 --- a/test/confs/0071 +++ b/test/confs/0071 @@ -1,6 +1,7 @@ # Exim test configuration 0071 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0072 b/test/confs/0072 index 110d3b1a9..db70561d7 100644 --- a/test/confs/0072 +++ b/test/confs/0072 @@ -5,6 +5,7 @@ ONLY= RETURN= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0073 b/test/confs/0073 index b39477878..1f50bd0eb 100644 --- a/test/confs/0073 +++ b/test/confs/0073 @@ -1,6 +1,7 @@ # Exim test configuration 0073 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0074 b/test/confs/0074 index 515330050..a5c95b8b5 100644 --- a/test/confs/0074 +++ b/test/confs/0074 @@ -1,6 +1,7 @@ # Exim test configuration 0074 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0075 b/test/confs/0075 index 5ed1218ce..8347a6308 100644 --- a/test/confs/0075 +++ b/test/confs/0075 @@ -1,6 +1,7 @@ # Exim test configuration 0075 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0076 b/test/confs/0076 index e95ee98da..0e9034c88 100644 --- a/test/confs/0076 +++ b/test/confs/0076 @@ -1,6 +1,7 @@ # Exim test configuration 0076 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0077 b/test/confs/0077 index aef2fd685..2f26d9e8d 100644 --- a/test/confs/0077 +++ b/test/confs/0077 @@ -1,6 +1,7 @@ # Exim test configuration 0077 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0078 b/test/confs/0078 index a9e660a71..9212aca78 100644 --- a/test/confs/0078 +++ b/test/confs/0078 @@ -1,6 +1,7 @@ # Exim test configuration 0078 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0079 b/test/confs/0079 index 522c9053b..7263d0a54 100644 --- a/test/confs/0079 +++ b/test/confs/0079 @@ -1,6 +1,7 @@ # Exim test configuration 0079 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0080 b/test/confs/0080 index cb83d3890..64efa8e7f 100644 --- a/test/confs/0080 +++ b/test/confs/0080 @@ -1,6 +1,7 @@ # Exim test configuration 0080 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0081 b/test/confs/0081 index 4bca680a4..0bc2ca51a 100644 --- a/test/confs/0081 +++ b/test/confs/0081 @@ -1,6 +1,7 @@ # Exim test configuration 0081 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0082 b/test/confs/0082 index b6fe0f453..894c81001 100644 --- a/test/confs/0082 +++ b/test/confs/0082 @@ -1,6 +1,7 @@ # Exim test configuration 0082 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0083 b/test/confs/0083 index 6cbb42e23..8af77d3c3 100644 --- a/test/confs/0083 +++ b/test/confs/0083 @@ -1,6 +1,7 @@ # Exim test configuration 0083 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0084 b/test/confs/0084 index 30a8cccb8..8601932ed 100644 --- a/test/confs/0084 +++ b/test/confs/0084 @@ -1,6 +1,7 @@ # Exim test configuration 0084 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0085 b/test/confs/0085 index 59bd0eea4..3502a04a7 100644 --- a/test/confs/0085 +++ b/test/confs/0085 @@ -1,6 +1,7 @@ # Exim test configuration 0085 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0086 b/test/confs/0086 index 2bf285a97..766de17e1 100644 --- a/test/confs/0086 +++ b/test/confs/0086 @@ -1,6 +1,7 @@ # Exim test configuration 0086 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0087 b/test/confs/0087 index 71cdc701c..c0c2b4400 100644 --- a/test/confs/0087 +++ b/test/confs/0087 @@ -1,6 +1,7 @@ # Exim test configuration 0087 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0088 b/test/confs/0088 index 96aaca6e7..9cfb4ced2 100644 --- a/test/confs/0088 +++ b/test/confs/0088 @@ -1,6 +1,7 @@ # Exim test configuration 0088 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0089 b/test/confs/0089 index 3b7f145c9..6b9dc0489 100644 --- a/test/confs/0089 +++ b/test/confs/0089 @@ -1,6 +1,7 @@ # Exim test configuration 0089 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0090 b/test/confs/0090 index ec524c83f..0ca4a81f5 100644 --- a/test/confs/0090 +++ b/test/confs/0090 @@ -1,6 +1,7 @@ # Exim test configuration 0090 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0091 b/test/confs/0091 index c65a94799..a276c93ea 100644 --- a/test/confs/0091 +++ b/test/confs/0091 @@ -1,6 +1,7 @@ # Exim test configuration 0091 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0092 b/test/confs/0092 index 62157cb33..c4222eb72 100644 --- a/test/confs/0092 +++ b/test/confs/0092 @@ -8,6 +8,7 @@ domainlist local_domains = test.ex : *.test.ex domainlist relay_domains = test.ex exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0093 b/test/confs/0093 index c8124fa82..05cd44942 100644 --- a/test/confs/0093 +++ b/test/confs/0093 @@ -1,6 +1,7 @@ # Exim test configuration 0093 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0094 b/test/confs/0094 index fd25acc31..2bb4c30cd 100644 --- a/test/confs/0094 +++ b/test/confs/0094 @@ -1,6 +1,7 @@ # Exim test configuration 0094 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0095 b/test/confs/0095 index f19bec7c1..666a6c5d0 100644 --- a/test/confs/0095 +++ b/test/confs/0095 @@ -4,6 +4,7 @@ ERT= QWM= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0096 b/test/confs/0096 index 98ac5f85a..5abcfc97f 100644 --- a/test/confs/0096 +++ b/test/confs/0096 @@ -1,6 +1,7 @@ # Exim test configuration 0096 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0097 b/test/confs/0097 index 9c4f7d931..d8b5f2933 100644 --- a/test/confs/0097 +++ b/test/confs/0097 @@ -1,6 +1,7 @@ # Exim test configuration 0097 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0098 b/test/confs/0098 index f23da44c6..4cab76fac 100644 --- a/test/confs/0098 +++ b/test/confs/0098 @@ -3,6 +3,7 @@ WMF= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0099 b/test/confs/0099 index c4e1a8339..b5cce9c69 100644 --- a/test/confs/0099 +++ b/test/confs/0099 @@ -3,6 +3,7 @@ RETRY = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0100 b/test/confs/0100 index 6d78adf06..c603215df 100644 --- a/test/confs/0100 +++ b/test/confs/0100 @@ -1,6 +1,7 @@ # Exim test configuration 0100 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0101 b/test/confs/0101 index ccee4194d..8e650b7bf 100644 --- a/test/confs/0101 +++ b/test/confs/0101 @@ -1,6 +1,7 @@ # Exim test configuration 0101 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0102 b/test/confs/0102 index 3b3e3d52e..21f545de7 100644 --- a/test/confs/0102 +++ b/test/confs/0102 @@ -1,6 +1,7 @@ # Exim test configuration 0102 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0103 b/test/confs/0103 index bff294a96..b887cda16 100644 --- a/test/confs/0103 +++ b/test/confs/0103 @@ -1,6 +1,7 @@ # Exim test configuration 0103 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0104 b/test/confs/0104 index e6c15b8c8..d1b9b296e 100644 --- a/test/confs/0104 +++ b/test/confs/0104 @@ -1,6 +1,7 @@ # Exim test configuration 0104 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0105 b/test/confs/0105 index 73550b395..a33e48338 100644 --- a/test/confs/0105 +++ b/test/confs/0105 @@ -1,6 +1,7 @@ # Exim test configuration 0105 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0106 b/test/confs/0106 index bd7cb84f8..ab432cfe3 100644 --- a/test/confs/0106 +++ b/test/confs/0106 @@ -1,6 +1,7 @@ # Exim test configuration 0106 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0107 b/test/confs/0107 index 6fd34ce7c..ad2bf74f5 100644 --- a/test/confs/0107 +++ b/test/confs/0107 @@ -1,6 +1,7 @@ # Exim test configuration 0107 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0108 b/test/confs/0108 index bbcb3e57f..deca61fc7 100644 --- a/test/confs/0108 +++ b/test/confs/0108 @@ -1,6 +1,7 @@ # Exim test configuration 0108 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0109 b/test/confs/0109 index d42a79d58..d7c2435d5 100644 --- a/test/confs/0109 +++ b/test/confs/0109 @@ -1,6 +1,7 @@ # Exim test configuration 0109 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0110 b/test/confs/0110 index b02cf5929..a4a707218 100644 --- a/test/confs/0110 +++ b/test/confs/0110 @@ -1,6 +1,7 @@ # Exim test configuration 0110 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0111 b/test/confs/0111 index cb95f577f..252131a0a 100644 --- a/test/confs/0111 +++ b/test/confs/0111 @@ -1,6 +1,7 @@ # Exim test configuration 0111 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0112 b/test/confs/0112 index 2b3b7bd4a..d07e2e15e 100644 --- a/test/confs/0112 +++ b/test/confs/0112 @@ -1,6 +1,7 @@ # Exim test configuration 0112 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0113 b/test/confs/0113 index 0d1240e29..dc164621a 100644 --- a/test/confs/0113 +++ b/test/confs/0113 @@ -1,6 +1,7 @@ # Exim test configuration 0113 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0114 b/test/confs/0114 index 8a4595f22..1b23d2e13 100644 --- a/test/confs/0114 +++ b/test/confs/0114 @@ -1,6 +1,7 @@ # Exim test configuration 0114 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0115 b/test/confs/0115 index 3f5fb8b4d..8b113204b 100644 --- a/test/confs/0115 +++ b/test/confs/0115 @@ -1,6 +1,7 @@ # Exim test configuration 0115 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0116 b/test/confs/0116 index 41aaf0d33..fb7fe600a 100644 --- a/test/confs/0116 +++ b/test/confs/0116 @@ -1,6 +1,7 @@ # Exim test configuration 0116 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0117 b/test/confs/0117 index 11b940984..4fd237279 100644 --- a/test/confs/0117 +++ b/test/confs/0117 @@ -1,6 +1,7 @@ # Exim test configuration 0117 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0118 b/test/confs/0118 index bf517b14d..4e08d55ab 100644 --- a/test/confs/0118 +++ b/test/confs/0118 @@ -1,6 +1,7 @@ # Exim test configuration 0118 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0119 b/test/confs/0119 index a25646b5e..e8187e4e5 100644 --- a/test/confs/0119 +++ b/test/confs/0119 @@ -1,6 +1,7 @@ # Exim test configuration 0119 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0120 b/test/confs/0120 index 8fd162d09..94e95e1ad 100644 --- a/test/confs/0120 +++ b/test/confs/0120 @@ -1,6 +1,7 @@ # Exim test configuration 0120 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0121 b/test/confs/0121 index 897c90a92..394282862 100644 --- a/test/confs/0121 +++ b/test/confs/0121 @@ -1,6 +1,7 @@ # Exim test configuration 0121 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0122 b/test/confs/0122 index b8bc34213..dbe4f83b2 100644 --- a/test/confs/0122 +++ b/test/confs/0122 @@ -1,6 +1,7 @@ # Exim test configuration 0122 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0123 b/test/confs/0123 index df35baf3d..3f8c21dcc 100644 --- a/test/confs/0123 +++ b/test/confs/0123 @@ -1,6 +1,7 @@ # Exim test configuration 0123 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0124 b/test/confs/0124 index 5f156e1f6..39f44f798 100644 --- a/test/confs/0124 +++ b/test/confs/0124 @@ -1,6 +1,7 @@ # Exim test configuration 0124 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0125 b/test/confs/0125 index 3b74967be..65251fe68 100644 --- a/test/confs/0125 +++ b/test/confs/0125 @@ -1,6 +1,7 @@ # Exim test configuration 0125 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0126 b/test/confs/0126 index 04583de9e..24cba5afa 100644 --- a/test/confs/0126 +++ b/test/confs/0126 @@ -1,6 +1,7 @@ # Exim test configuration 0126 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0127 b/test/confs/0127 index 3e95cf8d1..afeca992c 100644 --- a/test/confs/0127 +++ b/test/confs/0127 @@ -1,6 +1,7 @@ # Exim test configuration 0127 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.ex spool_directory = DIR/spool diff --git a/test/confs/0128 b/test/confs/0128 index 95271e30c..3818c0798 100644 --- a/test/confs/0128 +++ b/test/confs/0128 @@ -1,6 +1,7 @@ # Exim test configuration 0128 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0129 b/test/confs/0129 index b03391476..0efc2ad17 100644 --- a/test/confs/0129 +++ b/test/confs/0129 @@ -1,6 +1,7 @@ # Exim test configuration 0129 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0130 b/test/confs/0130 index 5ecdfc395..63d0ce270 100644 --- a/test/confs/0130 +++ b/test/confs/0130 @@ -1,6 +1,7 @@ # Exim test configuration 0130 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0131 b/test/confs/0131 index 50ae1db14..0a1030198 100644 --- a/test/confs/0131 +++ b/test/confs/0131 @@ -1,6 +1,7 @@ # Exim test configuration 0131 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0132 b/test/confs/0132 index 0ed262a73..ef67e13e9 100644 --- a/test/confs/0132 +++ b/test/confs/0132 @@ -1,6 +1,7 @@ # Exim test configuration 0132 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0133 b/test/confs/0133 index c43202121..b796d0b60 100644 --- a/test/confs/0133 +++ b/test/confs/0133 @@ -1,6 +1,7 @@ # Exim test configuration 0133 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0134 b/test/confs/0134 index 08519f38d..39c3eae78 100644 --- a/test/confs/0134 +++ b/test/confs/0134 @@ -1,6 +1,7 @@ # Exim test configuration 0134 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0135 b/test/confs/0135 index 4cef8c451..9f5239b63 100644 --- a/test/confs/0135 +++ b/test/confs/0135 @@ -1,6 +1,7 @@ # Exim test configuration 0135 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0136 b/test/confs/0136 index 014425213..d85dfd9be 100644 --- a/test/confs/0136 +++ b/test/confs/0136 @@ -3,6 +3,7 @@ BRB=true exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0137 b/test/confs/0137 index 45f3c442a..50893c3f4 100644 --- a/test/confs/0137 +++ b/test/confs/0137 @@ -1,6 +1,7 @@ # Exim test configuration 0137 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0138 b/test/confs/0138 index abe4665e4..c65fcd911 100644 --- a/test/confs/0138 +++ b/test/confs/0138 @@ -1,6 +1,7 @@ # Exim test configuration 0138 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0139 b/test/confs/0139 index 3a10b713c..eb35cc9a3 100644 --- a/test/confs/0139 +++ b/test/confs/0139 @@ -1,6 +1,7 @@ # Exim test configuration 0139 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0140 b/test/confs/0140 index e3d032431..2e965a90b 100644 --- a/test/confs/0140 +++ b/test/confs/0140 @@ -1,6 +1,7 @@ # Exim test configuration 0140 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0141 b/test/confs/0141 index 275e7e3b6..e22e1e8d7 100644 --- a/test/confs/0141 +++ b/test/confs/0141 @@ -1,6 +1,7 @@ # Exim test configuration 0141 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0142 b/test/confs/0142 index 672f0f4ec..0c216092d 100644 --- a/test/confs/0142 +++ b/test/confs/0142 @@ -1,6 +1,7 @@ # Exim test configuration 0142 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0143 b/test/confs/0143 index e1dd55ffb..2ae02c8a3 100644 --- a/test/confs/0143 +++ b/test/confs/0143 @@ -1,6 +1,7 @@ # Exim test configuration 0143 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0144 b/test/confs/0144 index 116416ec7..addfc0500 100644 --- a/test/confs/0144 +++ b/test/confs/0144 @@ -1,6 +1,7 @@ # Exim test configuration 0144 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0145 b/test/confs/0145 index 011b4c6d5..c9cb5b08b 100644 --- a/test/confs/0145 +++ b/test/confs/0145 @@ -1,6 +1,7 @@ # Exim test configuration 0145 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0146 b/test/confs/0146 index ae08e6ae2..38980f76c 100644 --- a/test/confs/0146 +++ b/test/confs/0146 @@ -1,6 +1,7 @@ # Exim test configuration 0146 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0147 b/test/confs/0147 index a7ad86bee..3159f15c6 100644 --- a/test/confs/0147 +++ b/test/confs/0147 @@ -7,6 +7,7 @@ ABCD_XYZ = abcdxyz ABCD=abcd + ABCD_XYZ exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0148 b/test/confs/0148 index 6a2a2f1c6..285272251 100644 --- a/test/confs/0148 +++ b/test/confs/0148 @@ -1,6 +1,7 @@ # Exim test configuration 0148 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0149 b/test/confs/0149 index c652322c5..4bde6026f 100644 --- a/test/confs/0149 +++ b/test/confs/0149 @@ -1,6 +1,7 @@ # Exim test configuration 0149 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/0150 b/test/confs/0150 index 3bdb03f64..6bc84b8d1 100644 --- a/test/confs/0150 +++ b/test/confs/0150 @@ -1,6 +1,7 @@ # Exim test configuration 0150 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0151 b/test/confs/0151 index 7f514cd45..a0ff21549 100644 --- a/test/confs/0151 +++ b/test/confs/0151 @@ -1,6 +1,7 @@ # Exim test configuration 0151 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0152 b/test/confs/0152 index 8272de7d4..2d95cf5ff 100644 --- a/test/confs/0152 +++ b/test/confs/0152 @@ -1,6 +1,7 @@ # Exim test configuration 0152 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0153 b/test/confs/0153 index 0a4b448a6..b349e146b 100644 --- a/test/confs/0153 +++ b/test/confs/0153 @@ -1,6 +1,7 @@ # Exim test configuration 0153 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0154 b/test/confs/0154 index 159d5e2f8..0427d4db0 100644 --- a/test/confs/0154 +++ b/test/confs/0154 @@ -1,6 +1,7 @@ # Exim test configuration 0154 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0155 b/test/confs/0155 index cd8ee91ac..551b4c68e 100644 --- a/test/confs/0155 +++ b/test/confs/0155 @@ -1,6 +1,7 @@ # Exim test configuration 0155 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0156 b/test/confs/0156 index fcf969a2c..c2d143e6c 100644 --- a/test/confs/0156 +++ b/test/confs/0156 @@ -1,6 +1,7 @@ # Exim test configuration 0156 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0157 b/test/confs/0157 index 237896558..cf4d973c1 100644 --- a/test/confs/0157 +++ b/test/confs/0157 @@ -1,6 +1,7 @@ # Exim test configuration 0157 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0158 b/test/confs/0158 index 06789cf36..04bcc7e86 100644 --- a/test/confs/0158 +++ b/test/confs/0158 @@ -1,6 +1,7 @@ # Exim test configuration 0158 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0159 b/test/confs/0159 index 64be164a9..73c3d0d39 100644 --- a/test/confs/0159 +++ b/test/confs/0159 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0160 b/test/confs/0160 index 1edac2f4a..5ed39bb6f 100644 --- a/test/confs/0160 +++ b/test/confs/0160 @@ -1,6 +1,7 @@ # Exim test configuration 0160 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0161 b/test/confs/0161 index e5409f011..038593363 100644 --- a/test/confs/0161 +++ b/test/confs/0161 @@ -1,6 +1,7 @@ # Exim test configuration 0161 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0162 b/test/confs/0162 index 077b9a41d..a1190efe5 100644 --- a/test/confs/0162 +++ b/test/confs/0162 @@ -1,6 +1,7 @@ # Exim test configuration 0162 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0163 b/test/confs/0163 index 4193741c2..829c481fc 100644 --- a/test/confs/0163 +++ b/test/confs/0163 @@ -1,6 +1,7 @@ # Exim test configuration 0163 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0164 b/test/confs/0164 index 814ea8109..0eed31142 100644 --- a/test/confs/0164 +++ b/test/confs/0164 @@ -1,6 +1,7 @@ # Exim test configuration 0164 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0165 b/test/confs/0165 index 5db2c0ae9..bcdc66dd2 100644 --- a/test/confs/0165 +++ b/test/confs/0165 @@ -1,6 +1,7 @@ # Exim test configuration 0165 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0166 b/test/confs/0166 index c8c20315e..2a73e0c10 100644 --- a/test/confs/0166 +++ b/test/confs/0166 @@ -1,6 +1,7 @@ # Exim test configuration 0166 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0167 b/test/confs/0167 index b74f1fa01..45e4ff23a 100644 --- a/test/confs/0167 +++ b/test/confs/0167 @@ -1,6 +1,7 @@ # Exim test configuration 0167 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0168 b/test/confs/0168 index 01db84368..6ae4fc75d 100644 --- a/test/confs/0168 +++ b/test/confs/0168 @@ -1,6 +1,7 @@ # Exim test configuration 0168 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0169 b/test/confs/0169 index 62504656f..9c6fcbe57 100644 --- a/test/confs/0169 +++ b/test/confs/0169 @@ -1,6 +1,7 @@ # Exim test configuration 0169 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0170 b/test/confs/0170 index e1f773a09..6fabc8e53 100644 --- a/test/confs/0170 +++ b/test/confs/0170 @@ -1,6 +1,7 @@ # Exim test configuration 0170 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0171 b/test/confs/0171 index 05b023abb..dec392544 100644 --- a/test/confs/0171 +++ b/test/confs/0171 @@ -1,6 +1,7 @@ # Exim test configuration 0171 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0172 b/test/confs/0172 index ea4cc6059..f08a16701 100644 --- a/test/confs/0172 +++ b/test/confs/0172 @@ -1,6 +1,7 @@ # Exim test configuration 0172 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0173 b/test/confs/0173 index ddde76cb4..d8fb3dbed 100644 --- a/test/confs/0173 +++ b/test/confs/0173 @@ -1,6 +1,7 @@ # Exim test configuration 0173 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0174 b/test/confs/0174 index 31e11e8ab..038c73edc 100644 --- a/test/confs/0174 +++ b/test/confs/0174 @@ -1,6 +1,7 @@ # Exim test configuration 0174 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0175 b/test/confs/0175 index 4f8be4fa5..a8d9819e1 100644 --- a/test/confs/0175 +++ b/test/confs/0175 @@ -1,6 +1,7 @@ # Exim test configuration 0175 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0176 b/test/confs/0176 index 48bd6ec5d..4dc07d021 100644 --- a/test/confs/0176 +++ b/test/confs/0176 @@ -1,6 +1,7 @@ # Exim test configuration 0176 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0177 b/test/confs/0177 index 4782202c4..ea299795f 100644 --- a/test/confs/0177 +++ b/test/confs/0177 @@ -1,6 +1,7 @@ # Exim test configuration 0177 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0178 b/test/confs/0178 index 647f5f8eb..400e0ef9b 100644 --- a/test/confs/0178 +++ b/test/confs/0178 @@ -1,6 +1,7 @@ # Exim test configuration 0178 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0179 b/test/confs/0179 index 39363d4ad..44f1aa30f 100644 --- a/test/confs/0179 +++ b/test/confs/0179 @@ -1,6 +1,7 @@ # Exim test configuration 0179 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0180 b/test/confs/0180 index 4f291f492..868f7d7ab 100644 --- a/test/confs/0180 +++ b/test/confs/0180 @@ -3,6 +3,7 @@ CSS=check_spool_space=100000000K exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0181 b/test/confs/0181 index a4e38dc78..445a077c9 100644 --- a/test/confs/0181 +++ b/test/confs/0181 @@ -1,6 +1,7 @@ # Exim test configuration 0181 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0182 b/test/confs/0182 index 1f0890578..f404a87e0 100644 --- a/test/confs/0182 +++ b/test/confs/0182 @@ -1,6 +1,7 @@ # Exim test configuration 0182 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0183 b/test/confs/0183 index 89b735a5e..afb69e4b1 100644 --- a/test/confs/0183 +++ b/test/confs/0183 @@ -1,6 +1,7 @@ # Exim test configuration 0183 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0184 b/test/confs/0184 index 1cc0c7bc7..22e4dd686 100644 --- a/test/confs/0184 +++ b/test/confs/0184 @@ -1,6 +1,7 @@ # Exim test configuration 0184 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0185 b/test/confs/0185 index d4a5dac1c..843ea7db2 100644 --- a/test/confs/0185 +++ b/test/confs/0185 @@ -1,6 +1,7 @@ # Exim test configuration 0185 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0186 b/test/confs/0186 index e22f42647..2f6cadbd0 100644 --- a/test/confs/0186 +++ b/test/confs/0186 @@ -1,6 +1,7 @@ # Exim test configuration 0186 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0187 b/test/confs/0187 index 9750ae090..bd55ec618 100644 --- a/test/confs/0187 +++ b/test/confs/0187 @@ -1,6 +1,7 @@ # Exim test configuration 0187 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0188 b/test/confs/0188 index 8778e1420..881645217 100644 --- a/test/confs/0188 +++ b/test/confs/0188 @@ -1,6 +1,7 @@ # Exim test configuration 0188 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0189 b/test/confs/0189 index fcf63ff02..11a4ac0c2 100644 --- a/test/confs/0189 +++ b/test/confs/0189 @@ -1,6 +1,7 @@ # Exim test configuration 0189 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0190 b/test/confs/0190 index 6925a373b..29763a603 100644 --- a/test/confs/0190 +++ b/test/confs/0190 @@ -1,6 +1,7 @@ # Exim test configuration 0190 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0191 b/test/confs/0191 index 0c7628ca2..bad03b130 100644 --- a/test/confs/0191 +++ b/test/confs/0191 @@ -1,6 +1,7 @@ # Exim test configuration 0191 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0192 b/test/confs/0192 index 419bc6fb6..efc2f215b 100644 --- a/test/confs/0192 +++ b/test/confs/0192 @@ -1,6 +1,7 @@ # Exim test configuration 0192 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0193 b/test/confs/0193 index e819e7066..095e7a384 100644 --- a/test/confs/0193 +++ b/test/confs/0193 @@ -1,6 +1,7 @@ # Exim test configuration 0193 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0194 b/test/confs/0194 index 94f810f05..2b3d7f186 100644 --- a/test/confs/0194 +++ b/test/confs/0194 @@ -1,6 +1,7 @@ # Exim test configuration 0194 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0195 b/test/confs/0195 index fd2e76782..30f766b0b 100644 --- a/test/confs/0195 +++ b/test/confs/0195 @@ -1,6 +1,7 @@ # Exim test configuration 0195 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0196 b/test/confs/0196 index 522cd4bb1..28b515242 100644 --- a/test/confs/0196 +++ b/test/confs/0196 @@ -1,6 +1,7 @@ # Exim test configuration 0196 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0197 b/test/confs/0197 index 96a8e0b8d..e4b458c95 100644 --- a/test/confs/0197 +++ b/test/confs/0197 @@ -4,6 +4,7 @@ # and these settings. exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0198 b/test/confs/0198 index de7b1f3bb..3497339bf 100644 --- a/test/confs/0198 +++ b/test/confs/0198 @@ -1,6 +1,7 @@ # Exim test configuration 0198 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0199 b/test/confs/0199 index 2d3f204c7..ac0974a8f 100644 --- a/test/confs/0199 +++ b/test/confs/0199 @@ -1,6 +1,7 @@ # Exim test configuration 0199 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0200 b/test/confs/0200 index 9eccd234c..4ab511684 100644 --- a/test/confs/0200 +++ b/test/confs/0200 @@ -1,6 +1,7 @@ # Exim test configuration 0200 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0201 b/test/confs/0201 index 69bb69b82..89b5db257 100644 --- a/test/confs/0201 +++ b/test/confs/0201 @@ -1,6 +1,7 @@ # Exim test configuration 0201 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0202 b/test/confs/0202 index 77eab7f21..ffb745295 100644 --- a/test/confs/0202 +++ b/test/confs/0202 @@ -1,6 +1,7 @@ # Exim test configuration 0202 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0203 b/test/confs/0203 index 64dd19c4c..6f4e9021e 100644 --- a/test/confs/0203 +++ b/test/confs/0203 @@ -1,6 +1,7 @@ # Exim test configuration 0203 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0204 b/test/confs/0204 index a9ff5bbdd..4a05eae20 100644 --- a/test/confs/0204 +++ b/test/confs/0204 @@ -1,6 +1,7 @@ # Exim test configuration 0204 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0205 b/test/confs/0205 index eeff8972f..712f37407 100644 --- a/test/confs/0205 +++ b/test/confs/0205 @@ -1,6 +1,7 @@ # Exim test configuration 0205 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0206 b/test/confs/0206 index d42392ef4..532bee2cb 100644 --- a/test/confs/0206 +++ b/test/confs/0206 @@ -1,6 +1,7 @@ # Exim test configuration 0206 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0207 b/test/confs/0207 index c8981ee76..6d0f12825 100644 --- a/test/confs/0207 +++ b/test/confs/0207 @@ -1,6 +1,7 @@ # Exim test configuration 0207 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0208 b/test/confs/0208 index 1212564d6..c5ba31116 100644 --- a/test/confs/0208 +++ b/test/confs/0208 @@ -3,6 +3,7 @@ MESSAGE_LOGS = true exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0209 b/test/confs/0209 index c8a473915..82c8be897 100644 --- a/test/confs/0209 +++ b/test/confs/0209 @@ -1,6 +1,7 @@ # Exim test configuration 0209 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0210 b/test/confs/0210 index 9e709f761..b107d870b 100644 --- a/test/confs/0210 +++ b/test/confs/0210 @@ -1,6 +1,7 @@ # Exim test configuration 0210 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0211 b/test/confs/0211 index 89e98a4ea..fdf66e078 100644 --- a/test/confs/0211 +++ b/test/confs/0211 @@ -1,6 +1,7 @@ # Exim test configuration 0211 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0212 b/test/confs/0212 index 1d14d8972..44dfc6f1a 100644 --- a/test/confs/0212 +++ b/test/confs/0212 @@ -1,6 +1,7 @@ # Exim test configuration 0212 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0213 b/test/confs/0213 index 226ade9ce..72e003c0c 100644 --- a/test/confs/0213 +++ b/test/confs/0213 @@ -1,6 +1,7 @@ # Exim test configuration 0213 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0214 b/test/confs/0214 index baaa2c06e..a2c3cf896 100644 --- a/test/confs/0214 +++ b/test/confs/0214 @@ -1,6 +1,7 @@ # Exim test configuration 0214 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0215 b/test/confs/0215 index 0109d89b6..28f3357f2 100644 --- a/test/confs/0215 +++ b/test/confs/0215 @@ -5,6 +5,7 @@ AUTHS= AUTHF= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0216 b/test/confs/0216 index 3250331b1..4f69c6b2b 100644 --- a/test/confs/0216 +++ b/test/confs/0216 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0217 b/test/confs/0217 index d1371dd10..4cdd8ea4b 100644 --- a/test/confs/0217 +++ b/test/confs/0217 @@ -3,6 +3,7 @@ HAP= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0218 b/test/confs/0218 index 2a4bff68d..5c8e0224f 100644 --- a/test/confs/0218 +++ b/test/confs/0218 @@ -1,6 +1,7 @@ # Exim test configuration 0218 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0219 b/test/confs/0219 index f3538a780..1f8973cac 100644 --- a/test/confs/0219 +++ b/test/confs/0219 @@ -1,6 +1,7 @@ # Exim test configuration 0219 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0220 b/test/confs/0220 index 095d207e0..a6d3ef458 100644 --- a/test/confs/0220 +++ b/test/confs/0220 @@ -1,6 +1,7 @@ # Exim test configuration 0220 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0221 b/test/confs/0221 index a28af6a16..bf6a8f66e 100644 --- a/test/confs/0221 +++ b/test/confs/0221 @@ -1,6 +1,7 @@ # Exim test configuration 0221 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0222 b/test/confs/0222 index 412baf220..b5ac5250a 100644 --- a/test/confs/0222 +++ b/test/confs/0222 @@ -1,6 +1,7 @@ # Exim test configuration 0222 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0223 b/test/confs/0223 index 93da92c5f..73b02acfc 100644 --- a/test/confs/0223 +++ b/test/confs/0223 @@ -1,6 +1,7 @@ # Exim test configuration 0223 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0224 b/test/confs/0224 index 6b87aa682..56fc67824 100644 --- a/test/confs/0224 +++ b/test/confs/0224 @@ -1,6 +1,7 @@ # Exim test configuration 0224 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0225 b/test/confs/0225 index 279b84a40..d5dca4d12 100644 --- a/test/confs/0225 +++ b/test/confs/0225 @@ -1,6 +1,7 @@ # Exim test configuration 0225 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0226 b/test/confs/0226 index 9ebdb7917..3e2e1130e 100644 --- a/test/confs/0226 +++ b/test/confs/0226 @@ -1,6 +1,7 @@ # Exim test configuration 0226 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0227 b/test/confs/0227 index adc942f06..6697ecb8c 100644 --- a/test/confs/0227 +++ b/test/confs/0227 @@ -1,6 +1,7 @@ # Exim test configuration 0227 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0228 b/test/confs/0228 index c143f9bcf..2030db6fd 100644 --- a/test/confs/0228 +++ b/test/confs/0228 @@ -1,6 +1,7 @@ # Exim test configuration 0228 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0229 b/test/confs/0229 index 151ed137c..0b4d0cece 100644 --- a/test/confs/0229 +++ b/test/confs/0229 @@ -1,6 +1,7 @@ # Exim test configuration 0229 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0230 b/test/confs/0230 index 350a110a8..7701f268a 100644 --- a/test/confs/0230 +++ b/test/confs/0230 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0231 b/test/confs/0231 index beb9da51f..0844b160c 100644 --- a/test/confs/0231 +++ b/test/confs/0231 @@ -1,6 +1,7 @@ # Exim test configuration 0231 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0232 b/test/confs/0232 index be4f39bf0..5d1f7aa9b 100644 --- a/test/confs/0232 +++ b/test/confs/0232 @@ -1,6 +1,7 @@ # Exim test configuration 0232 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0233 b/test/confs/0233 index a96661a5f..204393db2 100644 --- a/test/confs/0233 +++ b/test/confs/0233 @@ -1,6 +1,7 @@ # Exim test configuration 0233 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0234 b/test/confs/0234 index b94456cb4..ee4465464 100644 --- a/test/confs/0234 +++ b/test/confs/0234 @@ -1,6 +1,7 @@ # Exim test configuration 0234 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0235 b/test/confs/0235 index ef6da69f6..c61e049ba 100644 --- a/test/confs/0235 +++ b/test/confs/0235 @@ -1,6 +1,7 @@ # Exim test configuration 0235 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0236 b/test/confs/0236 index a6bd6750c..ed7b9851d 100644 --- a/test/confs/0236 +++ b/test/confs/0236 @@ -1,6 +1,7 @@ # Exim test configuration 0236 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0237 b/test/confs/0237 index e23daa1cc..64b21d883 100644 --- a/test/confs/0237 +++ b/test/confs/0237 @@ -1,6 +1,7 @@ # Exim test configuration 0237 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0238 b/test/confs/0238 index 6c1e8f3e5..762f79b88 100644 --- a/test/confs/0238 +++ b/test/confs/0238 @@ -1,6 +1,7 @@ # Exim test configuration 0238 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0239 b/test/confs/0239 index a68a76d9d..dad51060f 100644 --- a/test/confs/0239 +++ b/test/confs/0239 @@ -1,6 +1,7 @@ # Exim test configuration 0239 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0240 b/test/confs/0240 index acccc8f8b..7b87390c6 100644 --- a/test/confs/0240 +++ b/test/confs/0240 @@ -1,6 +1,7 @@ # Exim test configuration 0240 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0241 b/test/confs/0241 index f907b5f02..ef308b056 100644 --- a/test/confs/0241 +++ b/test/confs/0241 @@ -1,6 +1,7 @@ # Exim test configuration 0241 exim_path = EXIM_PATH/junk +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0242 b/test/confs/0242 index dfaa17aab..80def3188 100644 --- a/test/confs/0242 +++ b/test/confs/0242 @@ -1,6 +1,7 @@ # Exim test configuration 0242 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0243 b/test/confs/0243 index f13453f22..b129d5df0 100644 --- a/test/confs/0243 +++ b/test/confs/0243 @@ -1,6 +1,7 @@ # Exim test configuration 0243 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0244 b/test/confs/0244 index a144720a6..f49c6682c 100644 --- a/test/confs/0244 +++ b/test/confs/0244 @@ -1,6 +1,7 @@ # Exim test configuration 0244 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0245 b/test/confs/0245 index 7e87be030..f0d822f05 100644 --- a/test/confs/0245 +++ b/test/confs/0245 @@ -1,6 +1,7 @@ # Exim test configuration 0245 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0246 b/test/confs/0246 index 2cd7c3168..c180c3228 100644 --- a/test/confs/0246 +++ b/test/confs/0246 @@ -1,6 +1,7 @@ # Exim test configuration 0246 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0247 b/test/confs/0247 index 395a8ca62..604fa6d71 100644 --- a/test/confs/0247 +++ b/test/confs/0247 @@ -1,6 +1,7 @@ # Exim test configuration 0247 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0248 b/test/confs/0248 index 5828021ef..5d6efe85a 100644 --- a/test/confs/0248 +++ b/test/confs/0248 @@ -1,6 +1,7 @@ # Exim test configuration 0248 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0249 b/test/confs/0249 index 8367e24ed..8788611f4 100644 --- a/test/confs/0249 +++ b/test/confs/0249 @@ -1,6 +1,7 @@ # Exim test configuration 0249 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0250 b/test/confs/0250 index 78d960932..a91591b46 100644 --- a/test/confs/0250 +++ b/test/confs/0250 @@ -1,6 +1,7 @@ # Exim test configuration 0250 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0251 b/test/confs/0251 index 32e184c44..53b40073e 100644 --- a/test/confs/0251 +++ b/test/confs/0251 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0252 b/test/confs/0252 index 05e2aa626..f1efdedbb 100644 --- a/test/confs/0252 +++ b/test/confs/0252 @@ -1,6 +1,7 @@ # Exim test configuration 0252 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0253 b/test/confs/0253 index cc730cb8d..a72ec8971 100644 --- a/test/confs/0253 +++ b/test/confs/0253 @@ -1,6 +1,7 @@ # Exim test configuration 0253 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0254 b/test/confs/0254 index 799bc699e..49fbc3171 100644 --- a/test/confs/0254 +++ b/test/confs/0254 @@ -1,6 +1,7 @@ # Exim test configuration 0254 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0255 b/test/confs/0255 index 8f90f3486..494fe38a4 100644 --- a/test/confs/0255 +++ b/test/confs/0255 @@ -3,6 +3,7 @@ OPTION= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0256 b/test/confs/0256 index 1ebdd2b71..1013be6af 100644 --- a/test/confs/0256 +++ b/test/confs/0256 @@ -1,6 +1,7 @@ # Exim test configuration 0256 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0257 b/test/confs/0257 index 445ef68d0..aa673e0e5 100644 --- a/test/confs/0257 +++ b/test/confs/0257 @@ -1,6 +1,7 @@ # Exim test configuration 0257 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0258 b/test/confs/0258 index 3c13d6c4c..d8dc8fcbe 100644 --- a/test/confs/0258 +++ b/test/confs/0258 @@ -1,6 +1,7 @@ # Exim test configuration 0258 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0259 b/test/confs/0259 index fef46a187..87ff2b599 100644 --- a/test/confs/0259 +++ b/test/confs/0259 @@ -1,6 +1,7 @@ # Exim test configuration 0259 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex rfc1413_query_timeout = 5s diff --git a/test/confs/0260 b/test/confs/0260 index c2d9a8bfd..c93ba4857 100644 --- a/test/confs/0260 +++ b/test/confs/0260 @@ -1,6 +1,7 @@ # Exim test configuration 0260 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0261 b/test/confs/0261 index 0ac6903aa..640c3d4bb 100644 --- a/test/confs/0261 +++ b/test/confs/0261 @@ -1,6 +1,7 @@ # Exim test configuration 0261 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0262 b/test/confs/0262 index 0f84c7a5c..b41e41290 100644 --- a/test/confs/0262 +++ b/test/confs/0262 @@ -1,6 +1,7 @@ # Exim test configuration 0262 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0263 b/test/confs/0263 index 417bfeaaa..e5d1be52f 100644 --- a/test/confs/0263 +++ b/test/confs/0263 @@ -1,6 +1,7 @@ # Exim test configuration 0263 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0264 b/test/confs/0264 index ffa460296..351f887bd 100644 --- a/test/confs/0264 +++ b/test/confs/0264 @@ -1,6 +1,7 @@ # Exim test configuration 0264 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0265 b/test/confs/0265 index 87ffd2ee9..44433ee96 100644 --- a/test/confs/0265 +++ b/test/confs/0265 @@ -1,6 +1,7 @@ # Exim test configuration 0265 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0266 b/test/confs/0266 index 3a151f5df..654131599 100644 --- a/test/confs/0266 +++ b/test/confs/0266 @@ -1,6 +1,7 @@ # Exim test configuration 0266 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0267 b/test/confs/0267 index 73dc94b8b..088184133 100644 --- a/test/confs/0267 +++ b/test/confs/0267 @@ -1,6 +1,7 @@ # Exim test configuration 0267 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0268 b/test/confs/0268 index 0d22e85d9..97cd20afb 100644 --- a/test/confs/0268 +++ b/test/confs/0268 @@ -1,6 +1,7 @@ # Exim test configuration 0268 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0269 b/test/confs/0269 index e7b63605c..7a66a9470 100644 --- a/test/confs/0269 +++ b/test/confs/0269 @@ -1,6 +1,7 @@ # Exim test configuration 0269 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0270 b/test/confs/0270 index 3cd379d50..ff4ff94db 100644 --- a/test/confs/0270 +++ b/test/confs/0270 @@ -1,6 +1,7 @@ # Exim test configuration 0270 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0271 b/test/confs/0271 index 4e08b8fd1..27b70b952 100644 --- a/test/confs/0271 +++ b/test/confs/0271 @@ -1,6 +1,7 @@ # Exim test configuration 0271 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0272 b/test/confs/0272 index f4e8604f8..8d0a06c7a 100644 --- a/test/confs/0272 +++ b/test/confs/0272 @@ -1,6 +1,7 @@ # Exim test configuration 0272 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0273 b/test/confs/0273 index 180e30f7d..59859fd94 100644 --- a/test/confs/0273 +++ b/test/confs/0273 @@ -1,6 +1,7 @@ # Exim test configuration 0273 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0274 b/test/confs/0274 index ed318d228..b9386fa3d 100644 --- a/test/confs/0274 +++ b/test/confs/0274 @@ -1,6 +1,7 @@ # Exim test configuration 0274 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0275 b/test/confs/0275 index e4fc444b8..9fc81959d 100644 --- a/test/confs/0275 +++ b/test/confs/0275 @@ -1,6 +1,7 @@ # Exim test configuration 0275 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0276 b/test/confs/0276 index e3b3dc485..b2c2c4934 100644 --- a/test/confs/0276 +++ b/test/confs/0276 @@ -1,6 +1,7 @@ # Exim test configuration 0276 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0277 b/test/confs/0277 index 47d528656..eae651304 100644 --- a/test/confs/0277 +++ b/test/confs/0277 @@ -1,6 +1,7 @@ # Exim test configuration 0277 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0278 b/test/confs/0278 index 3b47eb751..e9df34ee1 100644 --- a/test/confs/0278 +++ b/test/confs/0278 @@ -1,6 +1,7 @@ # Exim test configuration 0278 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0279 b/test/confs/0279 index 5bcba7951..d2e0432d2 100644 --- a/test/confs/0279 +++ b/test/confs/0279 @@ -1,6 +1,7 @@ # Exim test configuration 0279 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0280 b/test/confs/0280 index 389176e60..8e7e800ad 100644 --- a/test/confs/0280 +++ b/test/confs/0280 @@ -1,6 +1,7 @@ # Exim test configuration 0280 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0281 b/test/confs/0281 index 94527a2d2..e4fa117de 100644 --- a/test/confs/0281 +++ b/test/confs/0281 @@ -1,6 +1,7 @@ # Exim test configuration 0281 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0282 b/test/confs/0282 index 90875f5c0..578e2b78c 100644 --- a/test/confs/0282 +++ b/test/confs/0282 @@ -1,6 +1,7 @@ # Exim test configuration 0282 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0283 b/test/confs/0283 index 23949cb1f..580775bdc 100644 --- a/test/confs/0283 +++ b/test/confs/0283 @@ -1,6 +1,7 @@ # Exim test configuration 0283 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0284 b/test/confs/0284 index f11e99bc2..2473ca84a 100644 --- a/test/confs/0284 +++ b/test/confs/0284 @@ -1,6 +1,7 @@ # Exim test configuration 0284 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0285 b/test/confs/0285 index c06762dab..deb4ae79c 100644 --- a/test/confs/0285 +++ b/test/confs/0285 @@ -1,6 +1,7 @@ # Exim test configuration 0285 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0286 b/test/confs/0286 index c5426f45f..26acbc050 100644 --- a/test/confs/0286 +++ b/test/confs/0286 @@ -1,6 +1,7 @@ # Exim test configuration 0286 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0287 b/test/confs/0287 index 8f9105c94..afd3d464c 100644 --- a/test/confs/0287 +++ b/test/confs/0287 @@ -1,6 +1,7 @@ # Exim test configuration 0287 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0288 b/test/confs/0288 index 270ffb29e..0b7f2ad8a 100644 --- a/test/confs/0288 +++ b/test/confs/0288 @@ -1,6 +1,7 @@ # Exim test configuration 0288 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0289 b/test/confs/0289 index a3d42e8c2..b068539ae 100644 --- a/test/confs/0289 +++ b/test/confs/0289 @@ -1,6 +1,7 @@ # Exim test configuration 0289 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0290 b/test/confs/0290 index 47b2cec34..4ae228fd3 100644 --- a/test/confs/0290 +++ b/test/confs/0290 @@ -11,6 +11,7 @@ C2=# C1C2 this should be a comment exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0291 b/test/confs/0291 index a3b3277b7..8290da7cd 100644 --- a/test/confs/0291 +++ b/test/confs/0291 @@ -1,6 +1,7 @@ # Exim test configuration 0291 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0292 b/test/confs/0292 index 708909793..059387576 100644 --- a/test/confs/0292 +++ b/test/confs/0292 @@ -1,6 +1,7 @@ # Exim test configuration 0292 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0293 b/test/confs/0293 index 4f841bb1f..4eff223b3 100644 --- a/test/confs/0293 +++ b/test/confs/0293 @@ -1,6 +1,7 @@ # Exim test configuration 0293 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0294 b/test/confs/0294 index e1338b022..6c0bd61e4 100644 --- a/test/confs/0294 +++ b/test/confs/0294 @@ -1,6 +1,7 @@ # Exim test configuration 0294 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0295 b/test/confs/0295 index a273eb2b9..28bea3f14 100644 --- a/test/confs/0295 +++ b/test/confs/0295 @@ -1,6 +1,7 @@ # Exim test configuration 0295 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0296 b/test/confs/0296 index 4f820bdc3..0d122c722 100644 --- a/test/confs/0296 +++ b/test/confs/0296 @@ -1,6 +1,7 @@ # Exim test configuration 0296 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0297 b/test/confs/0297 index 0e2ca1bd9..a2433dead 100644 --- a/test/confs/0297 +++ b/test/confs/0297 @@ -1,6 +1,7 @@ # Exim test configuration 0297 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0298 b/test/confs/0298 index 5517f8f5e..b19ca8bb4 100644 --- a/test/confs/0298 +++ b/test/confs/0298 @@ -1,6 +1,7 @@ # Exim test configuration 0298 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0299 b/test/confs/0299 index 7487182d5..9b1ced6d0 100644 --- a/test/confs/0299 +++ b/test/confs/0299 @@ -1,6 +1,7 @@ # Exim test configuration 0299 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0300 b/test/confs/0300 index 4587852ef..e791416bc 100644 --- a/test/confs/0300 +++ b/test/confs/0300 @@ -4,6 +4,7 @@ DELAY=0s PAH=127.0.0.1 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0301 b/test/confs/0301 index 813143149..dc5388216 100644 --- a/test/confs/0301 +++ b/test/confs/0301 @@ -1,6 +1,7 @@ # Exim test configuration 0301 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0302 b/test/confs/0302 index f41f6b389..f1b66bdc7 100644 --- a/test/confs/0302 +++ b/test/confs/0302 @@ -1,6 +1,7 @@ # Exim test configuration 0302 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0303 b/test/confs/0303 index 963d786d6..ef1cc637c 100644 --- a/test/confs/0303 +++ b/test/confs/0303 @@ -1,6 +1,7 @@ # Exim test configuration 0303 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0304 b/test/confs/0304 index 1f292a98c..1631b5c1a 100644 --- a/test/confs/0304 +++ b/test/confs/0304 @@ -1,6 +1,7 @@ # Exim test configuration 0304 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0305 b/test/confs/0305 index c208832c7..880985720 100644 --- a/test/confs/0305 +++ b/test/confs/0305 @@ -1,6 +1,7 @@ # Exim test configuration 0305 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0306 b/test/confs/0306 index a6bf031a9..b0fc90147 100644 --- a/test/confs/0306 +++ b/test/confs/0306 @@ -1,6 +1,7 @@ # Exim test configuration 0306 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0307 b/test/confs/0307 index e64a14edd..c81d533d3 100644 --- a/test/confs/0307 +++ b/test/confs/0307 @@ -1,6 +1,7 @@ # Exim test configuration 0307 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0308 b/test/confs/0308 index 0d917c772..bac1f5b77 100644 --- a/test/confs/0308 +++ b/test/confs/0308 @@ -1,6 +1,7 @@ # Exim test configuration 0308 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0309 b/test/confs/0309 index 13a53b360..471207787 100644 --- a/test/confs/0309 +++ b/test/confs/0309 @@ -1,6 +1,7 @@ # Exim test configuration 0309 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0310 b/test/confs/0310 index aec448cbe..1c943ba67 100644 --- a/test/confs/0310 +++ b/test/confs/0310 @@ -1,6 +1,7 @@ # Exim test configuration 0310 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0311 b/test/confs/0311 index 644cc5eb0..5fe3c9656 100644 --- a/test/confs/0311 +++ b/test/confs/0311 @@ -1,6 +1,7 @@ # Exim test configuration 0311 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0312 b/test/confs/0312 index b0adf43eb..8c6cf51ab 100644 --- a/test/confs/0312 +++ b/test/confs/0312 @@ -1,6 +1,7 @@ # Exim test configuration 0312 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0313 b/test/confs/0313 index 7cb021d61..a11320532 100644 --- a/test/confs/0313 +++ b/test/confs/0313 @@ -1,6 +1,7 @@ # Exim test configuration 0313 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0314 b/test/confs/0314 index 9baef2e20..c640286d4 100644 --- a/test/confs/0314 +++ b/test/confs/0314 @@ -1,6 +1,7 @@ # Exim test configuration 0314 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0315 b/test/confs/0315 index 61a712e0f..e633cdd3b 100644 --- a/test/confs/0315 +++ b/test/confs/0315 @@ -1,6 +1,7 @@ # Exim test configuration 0315 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0316 b/test/confs/0316 index 3d836d6c0..3c20ef99c 100644 --- a/test/confs/0316 +++ b/test/confs/0316 @@ -1,6 +1,7 @@ # Exim test configuration 0316 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0317 b/test/confs/0317 index efce1f8ee..6066642d9 100644 --- a/test/confs/0317 +++ b/test/confs/0317 @@ -1,6 +1,7 @@ # Exim test configuration 0317 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0318 b/test/confs/0318 index a88b37eac..6870e4c54 100644 --- a/test/confs/0318 +++ b/test/confs/0318 @@ -1,6 +1,7 @@ # Exim test configuration 0318 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0319 b/test/confs/0319 index 549c55f39..31ee9c30f 100644 --- a/test/confs/0319 +++ b/test/confs/0319 @@ -1,6 +1,7 @@ # Exim test configuration 0319 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0320 b/test/confs/0320 index e553a967c..28cb91f08 100644 --- a/test/confs/0320 +++ b/test/confs/0320 @@ -1,6 +1,7 @@ # Exim test configuration 0320 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0321 b/test/confs/0321 index 61dcd07ea..71b0c6f18 100644 --- a/test/confs/0321 +++ b/test/confs/0321 @@ -1,6 +1,7 @@ # Exim test configuration 0321 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0322 b/test/confs/0322 index 34385f708..b0943a990 100644 --- a/test/confs/0322 +++ b/test/confs/0322 @@ -3,6 +3,7 @@ LS= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0323 b/test/confs/0323 index 049bf1c1b..9c40b4491 100644 --- a/test/confs/0323 +++ b/test/confs/0323 @@ -1,6 +1,7 @@ # Exim test configuration 0323 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0324 b/test/confs/0324 index 814239701..0201c4cf6 100644 --- a/test/confs/0324 +++ b/test/confs/0324 @@ -1,6 +1,7 @@ # Exim test configuration 0324 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0325 b/test/confs/0325 index d6f006e7b..098e49f5e 100644 --- a/test/confs/0325 +++ b/test/confs/0325 @@ -1,6 +1,7 @@ # Exim test configuration 0325 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0326 b/test/confs/0326 index a8d6c6634..cd1006f52 100644 --- a/test/confs/0326 +++ b/test/confs/0326 @@ -1,6 +1,7 @@ # Exim test configuration 0326 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0327 b/test/confs/0327 index b6d8baa35..b4df4f271 100644 --- a/test/confs/0327 +++ b/test/confs/0327 @@ -1,6 +1,7 @@ # Exim test configuration 0327 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0328 b/test/confs/0328 index 516012a46..d7df4648b 100644 --- a/test/confs/0328 +++ b/test/confs/0328 @@ -1,6 +1,7 @@ # Exim test configuration 0328 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0329 b/test/confs/0329 index 58ddc4086..aab18fca0 100644 --- a/test/confs/0329 +++ b/test/confs/0329 @@ -1,6 +1,7 @@ # Exim test configuration 0329 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0330 b/test/confs/0330 index a5043257f..86e2e3a6a 100644 --- a/test/confs/0330 +++ b/test/confs/0330 @@ -1,6 +1,7 @@ # Exim test configuration 0330 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0331 b/test/confs/0331 index 96108ba65..881a4ca7d 100644 --- a/test/confs/0331 +++ b/test/confs/0331 @@ -1,6 +1,7 @@ # Exim test configuration 0331 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0332 b/test/confs/0332 index c7785dc58..789e7cb81 100644 --- a/test/confs/0332 +++ b/test/confs/0332 @@ -1,6 +1,7 @@ # Exim test configuration 0332 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0333 b/test/confs/0333 index 3113131f9..91956b7fc 100644 --- a/test/confs/0333 +++ b/test/confs/0333 @@ -1,6 +1,7 @@ # Exim test configuration 0333 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0334 b/test/confs/0334 index 989f66785..1ab1581ca 100644 --- a/test/confs/0334 +++ b/test/confs/0334 @@ -1,6 +1,7 @@ # Exim test configuration 0334 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0335 b/test/confs/0335 index 72d9a291a..8b21c218a 100644 --- a/test/confs/0335 +++ b/test/confs/0335 @@ -1,6 +1,7 @@ # Exim test configuration 0335 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0336 b/test/confs/0336 index ae6136b9a..35a7e86d7 100644 --- a/test/confs/0336 +++ b/test/confs/0336 @@ -1,6 +1,7 @@ # Exim test configuration 0336 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0337 b/test/confs/0337 index ce80752de..acf2813b4 100644 --- a/test/confs/0337 +++ b/test/confs/0337 @@ -1,6 +1,7 @@ # Exim test configuration 0337 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0338 b/test/confs/0338 index 4c14bc01c..9f132748d 100644 --- a/test/confs/0338 +++ b/test/confs/0338 @@ -1,6 +1,7 @@ # Exim test configuration 0338 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0339 b/test/confs/0339 index 04b8683df..70eb9dd36 100644 --- a/test/confs/0339 +++ b/test/confs/0339 @@ -1,6 +1,7 @@ # Exim test configuration 0339 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0340 b/test/confs/0340 index aa3a97577..efa16546a 100644 --- a/test/confs/0340 +++ b/test/confs/0340 @@ -1,6 +1,7 @@ # Exim test configuration 0340 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0341 b/test/confs/0341 index fcb187ac3..f6bbca8fb 100644 --- a/test/confs/0341 +++ b/test/confs/0341 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0342 b/test/confs/0342 index be285fd77..8caf9ba20 100644 --- a/test/confs/0342 +++ b/test/confs/0342 @@ -1,6 +1,7 @@ # Exim test configuration 0342 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0343 b/test/confs/0343 index 60fa9626c..5d76d8f12 100644 --- a/test/confs/0343 +++ b/test/confs/0343 @@ -1,6 +1,7 @@ # Exim test configuration 0343 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0344 b/test/confs/0344 index 9483069ad..fa129abb8 100644 --- a/test/confs/0344 +++ b/test/confs/0344 @@ -1,6 +1,7 @@ # Exim test configuration 0344 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0345 b/test/confs/0345 index ad35ca5ec..5042d9d08 100644 --- a/test/confs/0345 +++ b/test/confs/0345 @@ -1,6 +1,7 @@ # Exim test configuration 0345 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0346 b/test/confs/0346 index 560c55699..2e5122667 100644 --- a/test/confs/0346 +++ b/test/confs/0346 @@ -1,6 +1,7 @@ # Exim test configuration 0346 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0347 b/test/confs/0347 index a68f43380..ec56454eb 100644 --- a/test/confs/0347 +++ b/test/confs/0347 @@ -1,6 +1,7 @@ # Exim test configuration 0347 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0348 b/test/confs/0348 index c196b41e8..036b7806f 100644 --- a/test/confs/0348 +++ b/test/confs/0348 @@ -3,6 +3,7 @@ RETRY=G,1,20m,1.5 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0349 b/test/confs/0349 index 65b1083f2..4bcf9d403 100644 --- a/test/confs/0349 +++ b/test/confs/0349 @@ -1,6 +1,7 @@ # Exim test configuration 0349 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0350 b/test/confs/0350 index c842a2a4f..6741f8653 100644 --- a/test/confs/0350 +++ b/test/confs/0350 @@ -1,6 +1,7 @@ # Exim test configuration 0350 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0351 b/test/confs/0351 index f67365209..de326f334 100644 --- a/test/confs/0351 +++ b/test/confs/0351 @@ -1,6 +1,7 @@ # Exim test configuration 0351 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0352 b/test/confs/0352 index 67e48371f..0cbabd870 100644 --- a/test/confs/0352 +++ b/test/confs/0352 @@ -1,6 +1,7 @@ # Exim test configuration 0352 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0353 b/test/confs/0353 index e090d4850..3db7f6da5 100644 --- a/test/confs/0353 +++ b/test/confs/0353 @@ -1,6 +1,7 @@ # Exim test configuration 0353 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0354 b/test/confs/0354 index 523257c6e..f31994347 100644 --- a/test/confs/0354 +++ b/test/confs/0354 @@ -1,6 +1,7 @@ # Exim test configuration 0354 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0355 b/test/confs/0355 index 8615e0804..8eb4f3ddb 100644 --- a/test/confs/0355 +++ b/test/confs/0355 @@ -1,6 +1,7 @@ # Exim test configuration 0355 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0356 b/test/confs/0356 index 5a9311931..f0984344f 100644 --- a/test/confs/0356 +++ b/test/confs/0356 @@ -3,6 +3,7 @@ MESSAGE_LOGS = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0357 b/test/confs/0357 index a83c3899c..06ca9fc86 100644 --- a/test/confs/0357 +++ b/test/confs/0357 @@ -1,6 +1,7 @@ # Exim test configuration 0357 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0358 b/test/confs/0358 index 4a2b7dd20..601d67e43 100644 --- a/test/confs/0358 +++ b/test/confs/0358 @@ -1,6 +1,7 @@ # Exim test configuration 0358 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0359 b/test/confs/0359 index 5effea5f8..bd1c441ad 100644 --- a/test/confs/0359 +++ b/test/confs/0359 @@ -1,6 +1,7 @@ # Exim test configuration 0359 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0360 b/test/confs/0360 index a00f1029b..1df4a3964 100644 --- a/test/confs/0360 +++ b/test/confs/0360 @@ -1,6 +1,7 @@ # Exim test configuration 0360 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0361 b/test/confs/0361 index b374e1d6e..06f142203 100644 --- a/test/confs/0361 +++ b/test/confs/0361 @@ -1,6 +1,7 @@ # Exim test configuration 0361 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0362 b/test/confs/0362 index 2afdca6aa..1c751e48a 100644 --- a/test/confs/0362 +++ b/test/confs/0362 @@ -1,6 +1,7 @@ # Exim test configuration 0362 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0363 b/test/confs/0363 index 9b094f865..c2422540d 100644 --- a/test/confs/0363 +++ b/test/confs/0363 @@ -1,6 +1,7 @@ # Exim test configuration 0363 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0364 b/test/confs/0364 index 141189182..6afc17741 100644 --- a/test/confs/0364 +++ b/test/confs/0364 @@ -1,6 +1,7 @@ # Exim test configuration 0364 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0365 b/test/confs/0365 index fb7e872d3..c9393f9b8 100644 --- a/test/confs/0365 +++ b/test/confs/0365 @@ -4,6 +4,7 @@ DETAILS=false SELECTOR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0366 b/test/confs/0366 index 4ad94b157..e41c5863a 100644 --- a/test/confs/0366 +++ b/test/confs/0366 @@ -3,6 +3,7 @@ HOSTS_MAX_TRY=5 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0367 b/test/confs/0367 index 9f6a9d34b..807da4332 100644 --- a/test/confs/0367 +++ b/test/confs/0367 @@ -1,6 +1,7 @@ # Exim test configuration 0367 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0368 b/test/confs/0368 index 5afb8e786..6d3f10cb2 100644 --- a/test/confs/0368 +++ b/test/confs/0368 @@ -1,6 +1,7 @@ # Exim test configuration 0368 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0369 b/test/confs/0369 index 40043c47b..fc283f0a6 100644 --- a/test/confs/0369 +++ b/test/confs/0369 @@ -1,6 +1,7 @@ # Exim test configuration 0369 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0370 b/test/confs/0370 index 865dd6a9f..0602804b0 100644 --- a/test/confs/0370 +++ b/test/confs/0370 @@ -1,6 +1,7 @@ # Exim test configuration 0370 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0371 b/test/confs/0371 index 679a54bd9..d193902c6 100644 --- a/test/confs/0371 +++ b/test/confs/0371 @@ -1,6 +1,7 @@ # Exim test configuration 0371 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0372 b/test/confs/0372 index ac2b4bb2f..004c8df12 100644 --- a/test/confs/0372 +++ b/test/confs/0372 @@ -3,6 +3,7 @@ STRICT= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0373 b/test/confs/0373 index b0407ebd8..bec46ad46 100644 --- a/test/confs/0373 +++ b/test/confs/0373 @@ -1,6 +1,7 @@ # Exim test configuration 0373 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0374 b/test/confs/0374 index b345a9f28..29173a350 100644 --- a/test/confs/0374 +++ b/test/confs/0374 @@ -1,6 +1,7 @@ # Exim test configuration 0374 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0375 b/test/confs/0375 index 1c246afa0..efb58ff14 100644 --- a/test/confs/0375 +++ b/test/confs/0375 @@ -1,6 +1,7 @@ # Exim test configuration 0375 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0376 b/test/confs/0376 index 7a0b0fc42..49ee23c54 100644 --- a/test/confs/0376 +++ b/test/confs/0376 @@ -3,6 +3,7 @@ PEX=10s exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0377 b/test/confs/0377 index 729e80cbc..8499f6cb7 100644 --- a/test/confs/0377 +++ b/test/confs/0377 @@ -1,6 +1,7 @@ # Exim test configuration 0377 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0378 b/test/confs/0378 index 9f1ed6801..c008c50dd 100644 --- a/test/confs/0378 +++ b/test/confs/0378 @@ -1,6 +1,7 @@ # Exim test configuration 0378 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0379 b/test/confs/0379 index 7fca137e0..2413c7961 100644 --- a/test/confs/0379 +++ b/test/confs/0379 @@ -1,6 +1,7 @@ # Exim test configuration 0379 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0380 b/test/confs/0380 index 8403ccb5c..a18a0ff7f 100644 --- a/test/confs/0380 +++ b/test/confs/0380 @@ -1,6 +1,7 @@ # Exim test configuration 0380 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0381 b/test/confs/0381 index 4f7304e2c..e0d5677f9 100644 --- a/test/confs/0381 +++ b/test/confs/0381 @@ -1,6 +1,7 @@ # Exim test configuration 0381 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0382 b/test/confs/0382 index e986a284b..fe7369b32 100644 --- a/test/confs/0382 +++ b/test/confs/0382 @@ -1,6 +1,7 @@ # Exim test configuration 0382 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0383 b/test/confs/0383 index 1749bfad2..5e21fb510 100644 --- a/test/confs/0383 +++ b/test/confs/0383 @@ -1,6 +1,7 @@ # Exim test configuration 0383 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0384 b/test/confs/0384 index f8dce40f6..6a60417f9 100644 --- a/test/confs/0384 +++ b/test/confs/0384 @@ -1,6 +1,7 @@ # Exim test configuration 0384 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0385 b/test/confs/0385 index e21e3cb1c..6ad6ed9e1 100644 --- a/test/confs/0385 +++ b/test/confs/0385 @@ -1,6 +1,7 @@ # Exim test configuration 0385 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0386 b/test/confs/0386 index c9715f171..06af951e9 100644 --- a/test/confs/0386 +++ b/test/confs/0386 @@ -1,6 +1,7 @@ # Exim test configuration 0386 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0387 b/test/confs/0387 index 5b7d59171..ddafd5467 100644 --- a/test/confs/0387 +++ b/test/confs/0387 @@ -1,6 +1,7 @@ # Exim test configuration 0387 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0388 b/test/confs/0388 index 3806182d8..08d2db70f 100644 --- a/test/confs/0388 +++ b/test/confs/0388 @@ -1,6 +1,7 @@ # Exim test configuration 0388 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0389 b/test/confs/0389 index b3d5f660a..84c27588b 100644 --- a/test/confs/0389 +++ b/test/confs/0389 @@ -1,6 +1,7 @@ # Exim test configuration 0389 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0390 b/test/confs/0390 index 06932291c..05d33ecb3 100644 --- a/test/confs/0390 +++ b/test/confs/0390 @@ -1,6 +1,7 @@ # Exim test configuration 0390 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0391 b/test/confs/0391 index 2bea70832..fc5cf57e3 100644 --- a/test/confs/0391 +++ b/test/confs/0391 @@ -1,6 +1,7 @@ # Exim test configuration 0391 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0392 b/test/confs/0392 index bb6c683eb..d77cdc5fd 100644 --- a/test/confs/0392 +++ b/test/confs/0392 @@ -1,6 +1,7 @@ # Exim test configuration 0392 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0393 b/test/confs/0393 index 7b1d0fb13..92a65dfe4 100644 --- a/test/confs/0393 +++ b/test/confs/0393 @@ -3,6 +3,7 @@ FILTER=/bin/cat exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0394 b/test/confs/0394 index f7dfe9095..ddecebcce 100644 --- a/test/confs/0394 +++ b/test/confs/0394 @@ -3,6 +3,7 @@ OPT= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0395 b/test/confs/0395 index dda9055e9..229a7e45e 100644 --- a/test/confs/0395 +++ b/test/confs/0395 @@ -3,6 +3,7 @@ TRUSTED= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0396 b/test/confs/0396 index 5fd547f1a..518c6a9f5 100644 --- a/test/confs/0396 +++ b/test/confs/0396 @@ -1,6 +1,7 @@ # Exim test configuration 0396 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0397 b/test/confs/0397 index 99c86ac0a..413e9d7ba 100644 --- a/test/confs/0397 +++ b/test/confs/0397 @@ -1,6 +1,7 @@ # Exim test configuration 0397 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool gecos_pattern = "" diff --git a/test/confs/0398 b/test/confs/0398 index b894e46d8..ff12142c7 100644 --- a/test/confs/0398 +++ b/test/confs/0398 @@ -1,6 +1,7 @@ # Exim test configuration 0398 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0399 b/test/confs/0399 index 45e68e3c4..5c59311f9 100644 --- a/test/confs/0399 +++ b/test/confs/0399 @@ -1,6 +1,7 @@ # Exim test configuration 0399 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0400 b/test/confs/0400 index d2721dfeb..8006f8693 100644 --- a/test/confs/0400 +++ b/test/confs/0400 @@ -3,6 +3,7 @@ DATA= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0401 b/test/confs/0401 index 6a267d2b3..220010765 100644 --- a/test/confs/0401 +++ b/test/confs/0401 @@ -1,6 +1,7 @@ # Exim test configuration 0401 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0402 b/test/confs/0402 index b231629b8..f08edfb95 100644 --- a/test/confs/0402 +++ b/test/confs/0402 @@ -1,6 +1,7 @@ # Exim test configuration 0402 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0403 b/test/confs/0403 index dc7f09cbb..0af0c0413 100644 --- a/test/confs/0403 +++ b/test/confs/0403 @@ -1,6 +1,7 @@ # Exim test configuration 0403 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0404 b/test/confs/0404 index 5fe8c9b50..b3116802b 100644 --- a/test/confs/0404 +++ b/test/confs/0404 @@ -1,6 +1,7 @@ # Exim test configuration 0404 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0405 b/test/confs/0405 index 8fe224808..5347487e1 100644 --- a/test/confs/0405 +++ b/test/confs/0405 @@ -3,6 +3,7 @@ UTF8= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0406 b/test/confs/0406 index 26d4c2d64..1314e756c 100644 --- a/test/confs/0406 +++ b/test/confs/0406 @@ -1,6 +1,7 @@ # Exim test configuration 0406 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0407 b/test/confs/0407 index 5da660ce7..0d92d2110 100644 --- a/test/confs/0407 +++ b/test/confs/0407 @@ -4,6 +4,7 @@ HEADER_MAXSIZE= HEADER_LINE_MAXSIZE= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0408 b/test/confs/0408 index 9f1af13cb..b75b804f8 100644 --- a/test/confs/0408 +++ b/test/confs/0408 @@ -1,6 +1,7 @@ # Exim test configuration 0408 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0409 b/test/confs/0409 index d84f882ee..98fc10e45 100644 --- a/test/confs/0409 +++ b/test/confs/0409 @@ -3,6 +3,7 @@ BANNER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0410 b/test/confs/0410 index 6d416fc6a..da6b73d64 100644 --- a/test/confs/0410 +++ b/test/confs/0410 @@ -1,6 +1,7 @@ # Exim test configuration 0410 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0411 b/test/confs/0411 index d60c0ae44..6a50f1318 100644 --- a/test/confs/0411 +++ b/test/confs/0411 @@ -1,6 +1,7 @@ # Exim test configuration 0411 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0412 b/test/confs/0412 index da851b376..4fb964311 100644 --- a/test/confs/0412 +++ b/test/confs/0412 @@ -1,6 +1,7 @@ # Exim test configuration 0412 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0413 b/test/confs/0413 index daadb477e..fbc52ed2a 100644 --- a/test/confs/0413 +++ b/test/confs/0413 @@ -1,6 +1,7 @@ # Exim test configuration 0413 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0414 b/test/confs/0414 index 8a3b109f7..c5cc139b1 100644 --- a/test/confs/0414 +++ b/test/confs/0414 @@ -1,6 +1,7 @@ # Exim test configuration 0414 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0415 b/test/confs/0415 index 13e61d994..3a4f8f759 100644 --- a/test/confs/0415 +++ b/test/confs/0415 @@ -5,6 +5,7 @@ ARG2=1.0 VALUE=0 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0416 b/test/confs/0416 index c2780b0d5..b14711129 100644 --- a/test/confs/0416 +++ b/test/confs/0416 @@ -1,6 +1,7 @@ # Exim test configuration 0416 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0417 b/test/confs/0417 index 12c9f6890..6fb5384fb 100644 --- a/test/confs/0417 +++ b/test/confs/0417 @@ -3,6 +3,7 @@ RETURN_ERROR_DETAILS = false exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0418 b/test/confs/0418 index 9cf13e30c..087cd878c 100644 --- a/test/confs/0418 +++ b/test/confs/0418 @@ -1,6 +1,7 @@ # Exim test configuration 0418 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0419 b/test/confs/0419 index 74e7c6978..625a29569 100644 --- a/test/confs/0419 +++ b/test/confs/0419 @@ -1,6 +1,7 @@ # Exim test configuration 0419 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0420 b/test/confs/0420 index 4db37bf80..765dbe741 100644 --- a/test/confs/0420 +++ b/test/confs/0420 @@ -1,6 +1,7 @@ # Exim test configuration 0420 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0421 b/test/confs/0421 index ba1988103..d8a4515ad 100644 --- a/test/confs/0421 +++ b/test/confs/0421 @@ -1,6 +1,7 @@ # Exim test configuration 0421 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0422 b/test/confs/0422 index 00d8000f3..a72fe1179 100644 --- a/test/confs/0422 +++ b/test/confs/0422 @@ -1,6 +1,7 @@ # Exim test configuration 0422 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0423 b/test/confs/0423 index f6c9778e1..42c07540e 100644 --- a/test/confs/0423 +++ b/test/confs/0423 @@ -1,6 +1,7 @@ # Exim test configuration 0423 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0424 b/test/confs/0424 index 657741c2c..bd3c1bc69 100644 --- a/test/confs/0424 +++ b/test/confs/0424 @@ -1,6 +1,7 @@ # Exim test configuration 0424 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0425 b/test/confs/0425 index ca5ef4326..b9c18ca18 100644 --- a/test/confs/0425 +++ b/test/confs/0425 @@ -1,6 +1,7 @@ # Exim test configuration 0425 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0426 b/test/confs/0426 index 45ab74fe0..c7e61ce95 100644 --- a/test/confs/0426 +++ b/test/confs/0426 @@ -1,6 +1,7 @@ # Exim test configuration 0426 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0427 b/test/confs/0427 index f20028e49..e6d28976a 100644 --- a/test/confs/0427 +++ b/test/confs/0427 @@ -1,6 +1,7 @@ # Exim test configuration 0427 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0428 b/test/confs/0428 index fa00a43bf..1bb65749a 100644 --- a/test/confs/0428 +++ b/test/confs/0428 @@ -1,6 +1,7 @@ # Exim test configuration 0428 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0429 b/test/confs/0429 index aa9a4c77a..8f7e66d5c 100644 --- a/test/confs/0429 +++ b/test/confs/0429 @@ -1,6 +1,7 @@ # Exim test configuration 0429 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0430 b/test/confs/0430 index 4a0f8e3c4..6d8dea421 100644 --- a/test/confs/0430 +++ b/test/confs/0430 @@ -4,6 +4,7 @@ LIST= SELF=freeze exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0431 b/test/confs/0431 index bdb81372f..44abab42f 100644 --- a/test/confs/0431 +++ b/test/confs/0431 @@ -3,6 +3,7 @@ AFFIX= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0432 b/test/confs/0432 index cbc77885f..b625f87f9 100644 --- a/test/confs/0432 +++ b/test/confs/0432 @@ -1,6 +1,7 @@ # Exim test configuration 0432 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0433 b/test/confs/0433 index 905a6e57f..90b3f0dba 100644 --- a/test/confs/0433 +++ b/test/confs/0433 @@ -5,6 +5,7 @@ IFACE= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0434 b/test/confs/0434 index 19d7e11ad..103e60e44 100644 --- a/test/confs/0434 +++ b/test/confs/0434 @@ -3,6 +3,7 @@ ELI= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0435 b/test/confs/0435 index a2c43ad94..09a5e7bc2 100644 --- a/test/confs/0435 +++ b/test/confs/0435 @@ -1,6 +1,7 @@ # Exim test configuration 0435 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0436 b/test/confs/0436 index 358522b41..2ef123e93 100644 --- a/test/confs/0436 +++ b/test/confs/0436 @@ -1,6 +1,7 @@ # Exim test configuration 0436 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0437 b/test/confs/0437 index 6d050c508..bbcb3f667 100644 --- a/test/confs/0437 +++ b/test/confs/0437 @@ -1,6 +1,7 @@ # Exim test configuration 0437 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex diff --git a/test/confs/0438 b/test/confs/0438 index 9e89feb03..c0f8e45e0 100644 --- a/test/confs/0438 +++ b/test/confs/0438 @@ -1,6 +1,7 @@ # Exim test configuration 0438 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0439 b/test/confs/0439 index 8b3941ce5..0bc9578f5 100644 --- a/test/confs/0439 +++ b/test/confs/0439 @@ -1,6 +1,7 @@ # Exim test configuration 0439 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0440 b/test/confs/0440 index 06eb6ecdd..87ef6c893 100644 --- a/test/confs/0440 +++ b/test/confs/0440 @@ -1,6 +1,7 @@ # Exim test configuration 0440 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0441 b/test/confs/0441 index 45bd0f31e..b354c7c0f 100644 --- a/test/confs/0441 +++ b/test/confs/0441 @@ -1,6 +1,7 @@ # Exim test configuration 0441 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0442 b/test/confs/0442 index 004e1de6a..30c80ca80 100644 --- a/test/confs/0442 +++ b/test/confs/0442 @@ -3,6 +3,7 @@ BAD= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0443 b/test/confs/0443 index 5f85d8b49..8b7151e2a 100644 --- a/test/confs/0443 +++ b/test/confs/0443 @@ -1,6 +1,7 @@ # Exim test configuration 0443 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0444 b/test/confs/0444 index 79f2d1ad6..cef74a9c2 100644 --- a/test/confs/0444 +++ b/test/confs/0444 @@ -1,6 +1,7 @@ # Exim test configuration 0444 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0445 b/test/confs/0445 index bce937a10..f2461a2f1 100644 --- a/test/confs/0445 +++ b/test/confs/0445 @@ -1,6 +1,7 @@ # Exim test configuration 0445 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0446 b/test/confs/0446 index 16969e7cd..25f43963b 100644 --- a/test/confs/0446 +++ b/test/confs/0446 @@ -1,6 +1,7 @@ # Exim test configuration 0446 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0447 b/test/confs/0447 index ecdc5cd41..9aeb79715 100644 --- a/test/confs/0447 +++ b/test/confs/0447 @@ -3,6 +3,7 @@ INSERT= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0448 b/test/confs/0448 index b42ea187d..997f37859 100644 --- a/test/confs/0448 +++ b/test/confs/0448 @@ -1,6 +1,7 @@ # Exim test configuration 0448 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0449 b/test/confs/0449 index 1228f0914..932f05c7b 100644 --- a/test/confs/0449 +++ b/test/confs/0449 @@ -1,6 +1,7 @@ # Exim test configuration 0449 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0450 b/test/confs/0450 index d55634a8f..1304421b4 100644 --- a/test/confs/0450 +++ b/test/confs/0450 @@ -3,6 +3,7 @@ EXTRA= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0451 b/test/confs/0451 index b95c74bcd..5a1d110fd 100644 --- a/test/confs/0451 +++ b/test/confs/0451 @@ -1,6 +1,7 @@ # Exim test configuration 0451 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0452 b/test/confs/0452 index 47efb163f..2b54776df 100644 --- a/test/confs/0452 +++ b/test/confs/0452 @@ -1,6 +1,7 @@ # Exim test configuration 0452 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0453 b/test/confs/0453 index 5ab9f79f2..7aad7a8c2 100644 --- a/test/confs/0453 +++ b/test/confs/0453 @@ -3,6 +3,7 @@ LIMIT= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0454 b/test/confs/0454 index c91ca1d36..e5a27fbad 100644 --- a/test/confs/0454 +++ b/test/confs/0454 @@ -1,6 +1,7 @@ # Exim test configuration 0454 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0455 b/test/confs/0455 index 7b1849d70..ce2fcba4d 100644 --- a/test/confs/0455 +++ b/test/confs/0455 @@ -3,6 +3,7 @@ HOSTS_MAX_TRY=4 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0456 b/test/confs/0456 index c6c8f7ddd..204335050 100644 --- a/test/confs/0456 +++ b/test/confs/0456 @@ -3,6 +3,7 @@ HOSTS_MAX_TRY=4 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0457 b/test/confs/0457 index 4a8ea4a44..aec4cdf9b 100644 --- a/test/confs/0457 +++ b/test/confs/0457 @@ -1,6 +1,7 @@ # Exim test configuration 0457 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0458 b/test/confs/0458 index 17ed2b546..d66c561dc 100644 --- a/test/confs/0458 +++ b/test/confs/0458 @@ -1,6 +1,7 @@ # Exim test configuration 0458 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0459 b/test/confs/0459 index 86350d230..079bcebb7 100644 --- a/test/confs/0459 +++ b/test/confs/0459 @@ -1,6 +1,7 @@ # Exim test configuration 0459 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0460 b/test/confs/0460 index 505139b3c..43a678916 100644 --- a/test/confs/0460 +++ b/test/confs/0460 @@ -1,6 +1,7 @@ # Exim test configuration 0460 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0461 b/test/confs/0461 index 033082e89..501327ce8 100644 --- a/test/confs/0461 +++ b/test/confs/0461 @@ -6,6 +6,7 @@ RETRY1=1s RETRY2=2s exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0462 b/test/confs/0462 index 87d0adc35..7be6448f6 100644 --- a/test/confs/0462 +++ b/test/confs/0462 @@ -3,6 +3,7 @@ SELECTOR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0463 b/test/confs/0463 index 8f3a31101..b273794bc 100644 --- a/test/confs/0463 +++ b/test/confs/0463 @@ -1,6 +1,7 @@ # Exim test configuration 0463 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0464 b/test/confs/0464 index 49c9d612b..7c6c21f10 100644 --- a/test/confs/0464 +++ b/test/confs/0464 @@ -1,6 +1,7 @@ # Exim test configuration 0464 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0465 b/test/confs/0465 index 771b67af1..ee4bcfa6b 100644 --- a/test/confs/0465 +++ b/test/confs/0465 @@ -3,6 +3,7 @@ STD= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0466 b/test/confs/0466 index 1f9986f5f..aa45fd9ae 100644 --- a/test/confs/0466 +++ b/test/confs/0466 @@ -1,6 +1,7 @@ # Exim test configuration 0466 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0467 b/test/confs/0467 index 14a69f7c6..2af9ad0cf 100644 --- a/test/confs/0467 +++ b/test/confs/0467 @@ -3,6 +3,7 @@ SRV=smtp exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0468 b/test/confs/0468 index 2ef647dc9..1c46f7cf9 100644 --- a/test/confs/0468 +++ b/test/confs/0468 @@ -3,6 +3,7 @@ SRV=smtp exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0469 b/test/confs/0469 index 19a345ecc..757e088f3 100644 --- a/test/confs/0469 +++ b/test/confs/0469 @@ -3,6 +3,7 @@ SRV=smtp exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0470 b/test/confs/0470 index 723041fee..628fd9365 100644 --- a/test/confs/0470 +++ b/test/confs/0470 @@ -3,6 +3,7 @@ SRV=smtp exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0471 b/test/confs/0471 index 5fee8d5ff..04579824e 100644 --- a/test/confs/0471 +++ b/test/confs/0471 @@ -1,6 +1,7 @@ # Exim test configuration 0471 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0472 b/test/confs/0472 index 872feb781..e36633840 100644 --- a/test/confs/0472 +++ b/test/confs/0472 @@ -3,6 +3,7 @@ FUSER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0473 b/test/confs/0473 index ed48ce60c..4b6f0de9f 100644 --- a/test/confs/0473 +++ b/test/confs/0473 @@ -4,6 +4,7 @@ USE_SENDER = ,use_sender ACL_RCPT = acl_rcpt exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0474 b/test/confs/0474 index 05aec0f69..559dad512 100644 --- a/test/confs/0474 +++ b/test/confs/0474 @@ -1,6 +1,7 @@ # Exim test configuration 0474 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0475 b/test/confs/0475 index 9ca486541..6b5284f7f 100644 --- a/test/confs/0475 +++ b/test/confs/0475 @@ -1,6 +1,7 @@ # Exim test configuration 0475 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0476 b/test/confs/0476 index c8f76b8c8..f9690e44f 100644 --- a/test/confs/0476 +++ b/test/confs/0476 @@ -1,6 +1,7 @@ # Exim test configuration 0476 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0477 b/test/confs/0477 index ca40ec6be..82bd7dbf7 100644 --- a/test/confs/0477 +++ b/test/confs/0477 @@ -1,6 +1,7 @@ # Exim test configuration 0477 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0478 b/test/confs/0478 index 4938573d7..2b290b234 100644 --- a/test/confs/0478 +++ b/test/confs/0478 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog diff --git a/test/confs/0479 b/test/confs/0479 index 619496b1b..840ebd9ab 100644 --- a/test/confs/0479 +++ b/test/confs/0479 @@ -1,6 +1,7 @@ # Exim test configuration 0479 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0480 b/test/confs/0480 index b3a585fbb..b13a59f84 100644 --- a/test/confs/0480 +++ b/test/confs/0480 @@ -7,6 +7,7 @@ IP3=V4NET.0.0.3 SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog diff --git a/test/confs/0481 b/test/confs/0481 index 926db0f37..0e4864f1f 100644 --- a/test/confs/0481 +++ b/test/confs/0481 @@ -1,6 +1,7 @@ # Exim test configuration 0481 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0482 b/test/confs/0482 index 0a09cec72..911e81c9c 100644 --- a/test/confs/0482 +++ b/test/confs/0482 @@ -1,6 +1,7 @@ # Exim test configuration 0482 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0483 b/test/confs/0483 index 2fc6139a5..ad3606d7e 100644 --- a/test/confs/0483 +++ b/test/confs/0483 @@ -1,6 +1,7 @@ # Exim test configuration 0483 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0484 b/test/confs/0484 index 2248f9b3d..3a22e5154 100644 --- a/test/confs/0484 +++ b/test/confs/0484 @@ -1,6 +1,7 @@ # Exim test configuration 0484 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0485 b/test/confs/0485 index cec0b6a3b..7196acd88 100644 --- a/test/confs/0485 +++ b/test/confs/0485 @@ -1,6 +1,7 @@ # Exim test configuration 0485 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0486 b/test/confs/0486 index ac1ec8671..fd5805fbc 100644 --- a/test/confs/0486 +++ b/test/confs/0486 @@ -1,6 +1,7 @@ # Exim test configuration 0486 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0487 b/test/confs/0487 index 066de1a97..04645f49e 100644 --- a/test/confs/0487 +++ b/test/confs/0487 @@ -1,6 +1,7 @@ # Exim test configuration 0487 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0488 b/test/confs/0488 index 24815fc39..19a5e09c2 100644 --- a/test/confs/0488 +++ b/test/confs/0488 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0489 b/test/confs/0489 index fe34078bb..2a6e2edd0 100644 --- a/test/confs/0489 +++ b/test/confs/0489 @@ -1,6 +1,7 @@ # Exim test configuration 0489 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0490 b/test/confs/0490 index a46b32c6e..e54e6a937 100644 --- a/test/confs/0490 +++ b/test/confs/0490 @@ -1,6 +1,7 @@ # Exim test configuration 0490 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0491 b/test/confs/0491 index 934379b54..6aef50293 100644 --- a/test/confs/0491 +++ b/test/confs/0491 @@ -4,6 +4,7 @@ UL=abc@xyz REWRITE= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0492 b/test/confs/0492 index b2c481178..55c746e19 100644 --- a/test/confs/0492 +++ b/test/confs/0492 @@ -1,6 +1,7 @@ # Exim test configuration 0492 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0493 b/test/confs/0493 index e96cff519..f8dfe68f3 100644 --- a/test/confs/0493 +++ b/test/confs/0493 @@ -1,6 +1,7 @@ # Exim test configuration 0493 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0494 b/test/confs/0494 index ff56ff184..f768631ea 100644 --- a/test/confs/0494 +++ b/test/confs/0494 @@ -1,6 +1,7 @@ # Exim test configuration 0494 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0495 b/test/confs/0495 index 6af8a6ac7..981a83801 100644 --- a/test/confs/0495 +++ b/test/confs/0495 @@ -1,6 +1,7 @@ # Exim test configuration 0495 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0496 b/test/confs/0496 index de16b1b5c..779b0545f 100644 --- a/test/confs/0496 +++ b/test/confs/0496 @@ -1,6 +1,7 @@ # Exim test configuration 0496 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0497 b/test/confs/0497 index 1238e800f..991f95855 100644 --- a/test/confs/0497 +++ b/test/confs/0497 @@ -1,6 +1,7 @@ # Exim test configuration 0497 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0498 b/test/confs/0498 index c859c64f8..3d5d48195 100644 --- a/test/confs/0498 +++ b/test/confs/0498 @@ -1,6 +1,7 @@ # Exim test configuration 0498 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0499 b/test/confs/0499 index bd1cbf5d3..9fe3f0da7 100644 --- a/test/confs/0499 +++ b/test/confs/0499 @@ -1,6 +1,7 @@ # Exim test configuration 0499 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0500 b/test/confs/0500 index a7305353b..4277e91b4 100644 --- a/test/confs/0500 +++ b/test/confs/0500 @@ -1,6 +1,7 @@ # Exim test configuration 0500 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0501 b/test/confs/0501 index 8a85c835d..8e0d5db93 100644 --- a/test/confs/0501 +++ b/test/confs/0501 @@ -1,6 +1,7 @@ # Exim test configuration 0501 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0502 b/test/confs/0502 index cf3ceb74f..7694fb743 100644 --- a/test/confs/0502 +++ b/test/confs/0502 @@ -3,6 +3,7 @@ LAST=accept message = Your message here exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0503 b/test/confs/0503 index c260e6f5d..4842701f0 100644 --- a/test/confs/0503 +++ b/test/confs/0503 @@ -3,6 +3,7 @@ MSIZE= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0504 b/test/confs/0504 index 5030b55ba..38b94aa56 100644 --- a/test/confs/0504 +++ b/test/confs/0504 @@ -1,6 +1,7 @@ # Exim test configuration 0504 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0505 b/test/confs/0505 index 4ccba335b..9d17f9d82 100644 --- a/test/confs/0505 +++ b/test/confs/0505 @@ -5,6 +5,7 @@ CONTROL= RECIPIENT=acl_smtp_rcpt=accept exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0506 b/test/confs/0506 index 3ffb75d9e..a710de47d 100644 --- a/test/confs/0506 +++ b/test/confs/0506 @@ -4,6 +4,7 @@ ALLOW=allow_filter FORBID= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0507 b/test/confs/0507 index 90e6bde3b..8363b9b5f 100644 --- a/test/confs/0507 +++ b/test/confs/0507 @@ -3,6 +3,7 @@ ERROR_DETAILS= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0508 b/test/confs/0508 index 8cd546337..d8dcda6de 100644 --- a/test/confs/0508 +++ b/test/confs/0508 @@ -1,6 +1,7 @@ # Exim test configuration 0508 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0509 b/test/confs/0509 index b6978dddf..f4142bb07 100644 --- a/test/confs/0509 +++ b/test/confs/0509 @@ -1,6 +1,7 @@ # Exim test configuration 0509 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0510 b/test/confs/0510 index a519b9563..ddd079c48 100644 --- a/test/confs/0510 +++ b/test/confs/0510 @@ -1,6 +1,7 @@ # Exim test configuration 0510 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0511 b/test/confs/0511 index 10018f62d..5f92f69be 100644 --- a/test/confs/0511 +++ b/test/confs/0511 @@ -1,6 +1,7 @@ # Exim test configuration 0511 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0512 b/test/confs/0512 index a9d049c6b..c49a9e9f7 100644 --- a/test/confs/0512 +++ b/test/confs/0512 @@ -3,6 +3,7 @@ HARDLIMIT= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0513 b/test/confs/0513 index 11434516e..a617ef4d1 100644 --- a/test/confs/0513 +++ b/test/confs/0513 @@ -3,6 +3,7 @@ HARDLIMIT= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0514 b/test/confs/0514 index 50bbdea02..14408b37a 100644 --- a/test/confs/0514 +++ b/test/confs/0514 @@ -1,6 +1,7 @@ # Exim test configuration 0514 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0515 b/test/confs/0515 index eb54ff335..6e65ff8f7 100644 --- a/test/confs/0515 +++ b/test/confs/0515 @@ -1,6 +1,7 @@ # Exim test configuration 0515 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0516 b/test/confs/0516 index 0c0a6ed30..f2664c155 100644 --- a/test/confs/0516 +++ b/test/confs/0516 @@ -1,6 +1,7 @@ # Exim test configuration 0516 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0517 b/test/confs/0517 index 5d1fed5aa..e8d9b72e1 100644 --- a/test/confs/0517 +++ b/test/confs/0517 @@ -3,6 +3,7 @@ ERROR_DETAILS= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0518 b/test/confs/0518 index 5738eebd4..71316f469 100644 --- a/test/confs/0518 +++ b/test/confs/0518 @@ -1,6 +1,7 @@ # Exim test configuration 0518 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0519 b/test/confs/0519 index 510c698bd..960c12cd6 100644 --- a/test/confs/0519 +++ b/test/confs/0519 @@ -1,6 +1,7 @@ # Exim test configuration 0519 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0520 b/test/confs/0520 index 2d8bb8f62..5583f2e74 100644 --- a/test/confs/0520 +++ b/test/confs/0520 @@ -1,6 +1,7 @@ # Exim test configuration 0520 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0521 b/test/confs/0521 index 15555d8b1..3b131d70b 100644 --- a/test/confs/0521 +++ b/test/confs/0521 @@ -1,6 +1,7 @@ # Exim test configuration 0521 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0522 b/test/confs/0522 index 65fcdbfe2..c7c420536 100644 --- a/test/confs/0522 +++ b/test/confs/0522 @@ -3,6 +3,7 @@ TIMEOUTDEFER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0523 b/test/confs/0523 index 77a507867..bb95d2e90 100644 --- a/test/confs/0523 +++ b/test/confs/0523 @@ -1,6 +1,7 @@ # Exim test configuration 0523 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0524 b/test/confs/0524 index 76f0f0ad6..371936a06 100644 --- a/test/confs/0524 +++ b/test/confs/0524 @@ -1,6 +1,7 @@ # Exim test configuration 0524 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0525 b/test/confs/0525 index bab0c6620..94245f129 100644 --- a/test/confs/0525 +++ b/test/confs/0525 @@ -1,6 +1,7 @@ # Exim test configuration 0525 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0526 b/test/confs/0526 index 58f2f1a18..6e8f74ffa 100644 --- a/test/confs/0526 +++ b/test/confs/0526 @@ -1,6 +1,7 @@ # Exim test configuration 0526 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0527 b/test/confs/0527 index 11c98b9e8..0032c46b5 100644 --- a/test/confs/0527 +++ b/test/confs/0527 @@ -1,6 +1,7 @@ # Exim test configuration 0527 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0528 b/test/confs/0528 index 32176400a..95e92b817 100644 --- a/test/confs/0528 +++ b/test/confs/0528 @@ -1,6 +1,7 @@ # Exim test configuration 0528 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0529 b/test/confs/0529 index e87c8afd4..06daa2b6a 100644 --- a/test/confs/0529 +++ b/test/confs/0529 @@ -1,6 +1,7 @@ # Exim test configuration 0529 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0530 b/test/confs/0530 index fa2a2fdf9..f7a3a0867 100644 --- a/test/confs/0530 +++ b/test/confs/0530 @@ -1,6 +1,7 @@ # Exim test configuration 0530 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0531 b/test/confs/0531 index 192e3edaf..18902415e 100644 --- a/test/confs/0531 +++ b/test/confs/0531 @@ -1,6 +1,7 @@ # Exim test configuration 0531 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0532 b/test/confs/0532 index a00bb6b4c..9d78acf46 100644 --- a/test/confs/0532 +++ b/test/confs/0532 @@ -3,6 +3,7 @@ CONNECTCOND= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0533 b/test/confs/0533 index 78e343505..e0fb8bb62 100644 --- a/test/confs/0533 +++ b/test/confs/0533 @@ -1,6 +1,7 @@ # Exim test configuration 0533 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0534 b/test/confs/0534 index 259e005da..a498a4c69 100644 --- a/test/confs/0534 +++ b/test/confs/0534 @@ -1,6 +1,7 @@ # Exim test configuration 0534 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0535 b/test/confs/0535 index 1e8f63d85..d0fcab9ec 100644 --- a/test/confs/0535 +++ b/test/confs/0535 @@ -1,6 +1,7 @@ # Exim test configuration 0535 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0536 b/test/confs/0536 index 9d4a8ae72..e391c9784 100644 --- a/test/confs/0536 +++ b/test/confs/0536 @@ -3,6 +3,7 @@ FORBID_SMTP_CODE = false exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0537 b/test/confs/0537 index 8609b1e26..6fd8aba31 100644 --- a/test/confs/0537 +++ b/test/confs/0537 @@ -3,6 +3,7 @@ TRUSTED= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0538 b/test/confs/0538 index 65ec0fc32..6c1e966ef 100644 --- a/test/confs/0538 +++ b/test/confs/0538 @@ -1,6 +1,7 @@ # Exim test configuration 0538 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0539 b/test/confs/0539 index 6df895759..33d042236 100644 --- a/test/confs/0539 +++ b/test/confs/0539 @@ -1,6 +1,7 @@ # Exim test configuration 0539 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0540 b/test/confs/0540 index ce469a96c..5e7070125 100644 --- a/test/confs/0540 +++ b/test/confs/0540 @@ -1,6 +1,7 @@ # Exim test configuration 0540 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0541 b/test/confs/0541 index e5885f41c..213c0155c 100644 --- a/test/confs/0541 +++ b/test/confs/0541 @@ -1,6 +1,7 @@ # Exim test configuration 0541 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0542 b/test/confs/0542 index f9f2f10f8..b6e57ad40 100644 --- a/test/confs/0542 +++ b/test/confs/0542 @@ -1,6 +1,7 @@ # Exim test configuration 0542 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0543 b/test/confs/0543 index 25387f89e..6c0fcc214 100644 --- a/test/confs/0543 +++ b/test/confs/0543 @@ -1,6 +1,7 @@ # Exim test configuration 0543 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0544 b/test/confs/0544 index 23a5f36b2..6eda97ab6 100644 --- a/test/confs/0544 +++ b/test/confs/0544 @@ -1,6 +1,7 @@ # Exim test configuration 0544 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0545 b/test/confs/0545 index 8cbbf8b45..b323861f5 100644 --- a/test/confs/0545 +++ b/test/confs/0545 @@ -1,6 +1,7 @@ # Exim test configuration 0545 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0546 b/test/confs/0546 index 7d09866c2..052f841fc 100644 --- a/test/confs/0546 +++ b/test/confs/0546 @@ -4,6 +4,7 @@ HELO_MSG=One line RCPT_MSG=RCPT is OK exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0547 b/test/confs/0547 index 70519e667..262e2301b 100644 --- a/test/confs/0547 +++ b/test/confs/0547 @@ -3,6 +3,7 @@ MAXNM = 100 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0548 b/test/confs/0548 index 3eddcd3ce..41782e74c 100644 --- a/test/confs/0548 +++ b/test/confs/0548 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog diff --git a/test/confs/0549 b/test/confs/0549 index 29df1260c..28dc34461 100644 --- a/test/confs/0549 +++ b/test/confs/0549 @@ -1,6 +1,7 @@ # Exim test configuration 0549 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0550 b/test/confs/0550 index 088bb1535..d394e1f1b 100644 --- a/test/confs/0550 +++ b/test/confs/0550 @@ -1,6 +1,7 @@ # Exim test configuration 0550 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0551 b/test/confs/0551 index d47bf4d17..2a8753138 100644 --- a/test/confs/0551 +++ b/test/confs/0551 @@ -3,6 +3,7 @@ LS=+pid exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0552 b/test/confs/0552 index bc8b5ae45..43d7721b8 100644 --- a/test/confs/0552 +++ b/test/confs/0552 @@ -4,6 +4,7 @@ DDF= SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0553 b/test/confs/0553 index f7345484a..2907bcfd3 100644 --- a/test/confs/0553 +++ b/test/confs/0553 @@ -4,6 +4,7 @@ DCF = SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0554 b/test/confs/0554 index 2edb0ff6c..db1c554f7 100644 --- a/test/confs/0554 +++ b/test/confs/0554 @@ -1,6 +1,7 @@ # Exim test configuration 0554 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0555 b/test/confs/0555 index 64e169dea..d13d23543 100644 --- a/test/confs/0555 +++ b/test/confs/0555 @@ -3,6 +3,7 @@ FAKE=fakereject exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0556 b/test/confs/0556 index 2708b01fd..bac316961 100644 --- a/test/confs/0556 +++ b/test/confs/0556 @@ -6,6 +6,7 @@ ACL_PREDATA=accept PAH=127.0.0.1 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0557 b/test/confs/0557 index 6bfb069d3..052b13cbd 100644 --- a/test/confs/0557 +++ b/test/confs/0557 @@ -6,6 +6,7 @@ HOSTS= HAI= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0558 b/test/confs/0558 index 3cdb17fc7..9c8783cab 100644 --- a/test/confs/0558 +++ b/test/confs/0558 @@ -1,6 +1,7 @@ # Exim test configuration 0558 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0559 b/test/confs/0559 index db1d8b212..061a4aaaf 100644 --- a/test/confs/0559 +++ b/test/confs/0559 @@ -1,6 +1,7 @@ # Exim test configuration 0559 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0560 b/test/confs/0560 index 68bf16b64..3b79d3d34 100644 --- a/test/confs/0560 +++ b/test/confs/0560 @@ -1,6 +1,7 @@ # Exim test configuration 0560 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0561 b/test/confs/0561 index c8ca8a72f..1dca521da 100644 --- a/test/confs/0561 +++ b/test/confs/0561 @@ -3,6 +3,7 @@ QOLL=true exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0562 b/test/confs/0562 index ed0ae2b48..5693c9267 100644 --- a/test/confs/0562 +++ b/test/confs/0562 @@ -1,6 +1,7 @@ # Exim test configuration 0562 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0563 b/test/confs/0563 index 320fb8b98..459a2c6d9 100644 --- a/test/confs/0563 +++ b/test/confs/0563 @@ -1,7 +1,9 @@ # Exim test configuration 0563 +exim_path = EXIM_PATH qualify_domain = testexim.test.ex localpartlist aliases = joe:sam:tom +keep_environment = begin routers diff --git a/test/confs/0564 b/test/confs/0564 index 443d28500..b9d18a6d8 100644 --- a/test/confs/0564 +++ b/test/confs/0564 @@ -1,6 +1,7 @@ # Exim test configuration 0564 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0565 b/test/confs/0565 index 979cfc787..a6cf3c4a2 100644 --- a/test/confs/0565 +++ b/test/confs/0565 @@ -1,6 +1,7 @@ # Exim test configuration 0565 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0566 b/test/confs/0566 index 98df1bf7f..7db8be35d 100644 --- a/test/confs/0566 +++ b/test/confs/0566 @@ -1,6 +1,7 @@ # Exim test configuration 0566 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0567 b/test/confs/0567 index 5eae157f8..fe375f656 100644 --- a/test/confs/0567 +++ b/test/confs/0567 @@ -3,6 +3,7 @@ CONNECTCOND= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0569 b/test/confs/0569 index 517c38535..54e606c38 100644 --- a/test/confs/0569 +++ b/test/confs/0569 @@ -1,6 +1,7 @@ # Exim test configuration 0569 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0570 b/test/confs/0570 index 6cf080737..96c3df4f6 100644 --- a/test/confs/0570 +++ b/test/confs/0570 @@ -4,6 +4,7 @@ OPTION = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0600 b/test/confs/0600 index d8ff26a6f..3d3f4f135 100644 --- a/test/confs/0600 +++ b/test/confs/0600 @@ -2,6 +2,7 @@ # utf8clean:string exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/0601 b/test/confs/0601 index c55ac4a1b..3a7bb8b45 100644 --- a/test/confs/0601 +++ b/test/confs/0601 @@ -2,6 +2,7 @@ # udpsend exim_path = EXIM_PATH +keep_environment = spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog queue_only diff --git a/test/confs/0602 b/test/confs/0602 index 048175d5e..a5b37bfb3 100644 --- a/test/confs/0602 +++ b/test/confs/0602 @@ -1,6 +1,7 @@ # Exim test configuration 0602 exim_path = EXIM_PATH +keep_environment = spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_pattern = "" diff --git a/test/confs/0603 b/test/confs/0603 index bc84cc0d1..91dab7a60 100644 --- a/test/confs/0603 +++ b/test/confs/0603 @@ -8,6 +8,7 @@ untrusted_set_sender = * SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns #primary_hostname = myhost.test.ex rfc1413_query_timeout = 0s diff --git a/test/confs/0604 b/test/confs/0604 index 77376cdcd..cd1133264 100644 --- a/test/confs/0604 +++ b/test/confs/0604 @@ -7,6 +7,7 @@ untrusted_set_sender = * SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns #primary_hostname = myhost.test.ex rfc1413_query_timeout = 0s diff --git a/test/confs/0605 b/test/confs/0605 index 7fce427d5..ec79422e2 100644 --- a/test/confs/0605 +++ b/test/confs/0605 @@ -1,6 +1,7 @@ # Exim test configuration 0605 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog diff --git a/test/confs/0606 b/test/confs/0606 index 538e859de..3876c2738 100644 --- a/test/confs/0606 +++ b/test/confs/0606 @@ -1,6 +1,7 @@ # Exim test configuration 0606 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog diff --git a/test/confs/0607 b/test/confs/0607 index af4d238b5..3c191b477 100644 --- a/test/confs/0607 +++ b/test/confs/0607 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog diff --git a/test/confs/0608 b/test/confs/0608 index d04dc369f..390daf1ab 100644 --- a/test/confs/0608 +++ b/test/confs/0608 @@ -1,6 +1,7 @@ # Exim test configuration 0608 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0609 b/test/confs/0609 index d6ac511fd..e60e612aa 100644 --- a/test/confs/0609 +++ b/test/confs/0609 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/0615 b/test/confs/0615 new file mode 100644 index 000000000..bbfc4978a --- /dev/null +++ b/test/confs/0615 @@ -0,0 +1,6 @@ +# exim test configuration 0615 +exim_path = EXIM_PATH +tls_advertise_hosts = +perl_startup = $| = 1; \ + print "Environment visible in Perl:\n"; \ + print map { "$_=$ENV{$_}\n" } sort keys %ENV; diff --git a/test/confs/0616 b/test/confs/0616 new file mode 100644 index 000000000..7962d9734 --- /dev/null +++ b/test/confs/0616 @@ -0,0 +1,8 @@ +# exim test configuration 0616 +exim_path = EXIM_PATH +keep_environment = ^FOO\d : BAR +add_environment = ADDED1=added1 : ADDED2=added2 +tls_advertise_hosts = +perl_startup = $| = 1; \ + print "Environment visible in Perl:\n"; \ + print map { "$_=$ENV{$_}\n" } sort keys %ENV; diff --git a/test/confs/1000 b/test/confs/1000 index 9e7b57ba6..17fdc3662 100644 --- a/test/confs/1000 +++ b/test/confs/1000 @@ -3,6 +3,7 @@ HL= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/1001 b/test/confs/1001 index aa53c717b..3fcf5014b 100644 --- a/test/confs/1001 +++ b/test/confs/1001 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/1002 b/test/confs/1002 index 99a5866d9..e39b3d887 100644 --- a/test/confs/1002 +++ b/test/confs/1002 @@ -1,6 +1,7 @@ # Exim test configuration 1002 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/1003 b/test/confs/1003 index 9597b3f26..20daf4338 100644 --- a/test/confs/1003 +++ b/test/confs/1003 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/1005 b/test/confs/1005 index 001cd83e1..913f3861f 100644 --- a/test/confs/1005 +++ b/test/confs/1005 @@ -1,6 +1,7 @@ # Exim test configuration 1005 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/1006 b/test/confs/1006 index c45c3b308..7fc44c9f9 100644 --- a/test/confs/1006 +++ b/test/confs/1006 @@ -4,6 +4,7 @@ SERVER= D6= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/1007 b/test/confs/1007 index bd4f6e950..0960dc3b0 100644 --- a/test/confs/1007 +++ b/test/confs/1007 @@ -5,6 +5,7 @@ IFACE= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/1008 b/test/confs/1008 index 11fd0be57..f6a9a24a9 100644 --- a/test/confs/1008 +++ b/test/confs/1008 @@ -1,6 +1,7 @@ # Exim test configuration 1008 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/1009 b/test/confs/1009 index 1bbbdd355..888077a52 100644 --- a/test/confs/1009 +++ b/test/confs/1009 @@ -1,6 +1,7 @@ # Exim test configuration 1009 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/1010 b/test/confs/1010 index ed19a0e21..2ec23a8b8 100644 --- a/test/confs/1010 +++ b/test/confs/1010 @@ -1,6 +1,7 @@ # Exim test configuration 1010 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2000 b/test/confs/2000 index 7a2d34b2f..c34c4f313 100644 --- a/test/confs/2000 +++ b/test/confs/2000 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2001 b/test/confs/2001 index e2572df3a..f1dc48078 100644 --- a/test/confs/2001 +++ b/test/confs/2001 @@ -4,6 +4,7 @@ OPTION= SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2002 b/test/confs/2002 index b154c82d3..f453d713b 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -1,6 +1,7 @@ # Exim test configuration 2002 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2003 b/test/confs/2003 index 8631514b8..17a781911 100644 --- a/test/confs/2003 +++ b/test/confs/2003 @@ -1,6 +1,7 @@ # Exim test configuration 2003 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2004 b/test/confs/2004 index 2979685ec..7fc1ab261 100644 --- a/test/confs/2004 +++ b/test/confs/2004 @@ -1,6 +1,7 @@ # Exim test configuration 2004 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2005 b/test/confs/2005 index 5b57b60ff..519eb06ab 100644 --- a/test/confs/2005 +++ b/test/confs/2005 @@ -1,6 +1,7 @@ # Exim test configuration 2005 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2006 b/test/confs/2006 index 8c1a13da2..3808ceeb9 100644 --- a/test/confs/2006 +++ b/test/confs/2006 @@ -1,6 +1,7 @@ # Exim test configuration 2006 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2007 b/test/confs/2007 index 5bdf76f03..934387512 100644 --- a/test/confs/2007 +++ b/test/confs/2007 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2008 b/test/confs/2008 index 4bad74a1b..a84ced8a2 100644 --- a/test/confs/2008 +++ b/test/confs/2008 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2009 b/test/confs/2009 index 66fadea29..dbc8b871e 100644 --- a/test/confs/2009 +++ b/test/confs/2009 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2010 b/test/confs/2010 index 8aede594a..4c01eb3b6 100644 --- a/test/confs/2010 +++ b/test/confs/2010 @@ -5,6 +5,7 @@ TIMES = HOSTS = 127.0.0.1 : HOSTIPV4 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2012 b/test/confs/2012 index 59265d407..5148a90ea 100644 --- a/test/confs/2012 +++ b/test/confs/2012 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2013 b/test/confs/2013 index 331dd09ef..bddd8ac4a 100644 --- a/test/confs/2013 +++ b/test/confs/2013 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2014 b/test/confs/2014 index 562e916fd..f5fc2bb2d 100644 --- a/test/confs/2014 +++ b/test/confs/2014 @@ -3,6 +3,7 @@ CRL= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2015 b/test/confs/2015 index 734c2834a..cdf3e592b 100644 --- a/test/confs/2015 +++ b/test/confs/2015 @@ -1,6 +1,7 @@ # Exim test configuration 2015 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2016 b/test/confs/2016 index f58c9af58..3902f15da 100644 --- a/test/confs/2016 +++ b/test/confs/2016 @@ -1,6 +1,7 @@ # Exim test configuration 2016 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/2017 b/test/confs/2017 index 26b257cd5..b61fba587 100644 --- a/test/confs/2017 +++ b/test/confs/2017 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2018 b/test/confs/2018 index 4afe33b96..6f61f9832 100644 --- a/test/confs/2018 +++ b/test/confs/2018 @@ -1,6 +1,7 @@ # Exim test configuration 2018 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2019 b/test/confs/2019 index f3ddd4591..4c9c9245d 100644 --- a/test/confs/2019 +++ b/test/confs/2019 @@ -1,6 +1,7 @@ # Exim test configuration 2019 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2020 b/test/confs/2020 index 7bde46415..241d88335 100644 --- a/test/confs/2020 +++ b/test/confs/2020 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" diff --git a/test/confs/2021 b/test/confs/2021 index a441e34a3..4042fae03 100644 --- a/test/confs/2021 +++ b/test/confs/2021 @@ -4,6 +4,7 @@ REQUIRE=# TRYCLEAR=# exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2022 b/test/confs/2022 index d11dd5e9e..b4d098c94 100644 --- a/test/confs/2022 +++ b/test/confs/2022 @@ -1,6 +1,7 @@ # Exim test configuration 2022 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2023 b/test/confs/2023 index 2b5efb5d6..fdfcb287d 100644 --- a/test/confs/2023 +++ b/test/confs/2023 @@ -1,6 +1,7 @@ # Exim test configuration 2023 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2024 b/test/confs/2024 index 438899444..9d10d006d 100644 --- a/test/confs/2024 +++ b/test/confs/2024 @@ -4,6 +4,7 @@ CERT=DIR/aux-fixed/cert1 TVC=/dev/null exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2025 b/test/confs/2025 index ccb56dcb2..ac1476b10 100644 --- a/test/confs/2025 +++ b/test/confs/2025 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2026 b/test/confs/2026 index 38900bb53..7da11a528 100644 --- a/test/confs/2026 +++ b/test/confs/2026 @@ -1,6 +1,7 @@ # Exim test configuration 2026 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2027 b/test/confs/2027 index bd15ea944..6429fec7d 100644 --- a/test/confs/2027 +++ b/test/confs/2027 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2028 b/test/confs/2028 index 38c14f249..71d708d57 100644 --- a/test/confs/2028 +++ b/test/confs/2028 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2029 b/test/confs/2029 index b98cf7348..0fdd8e617 100644 --- a/test/confs/2029 +++ b/test/confs/2029 @@ -1,6 +1,7 @@ # Exim test configuration 2029 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2030 b/test/confs/2030 index e89e1c99f..80bf30b3e 100644 --- a/test/confs/2030 +++ b/test/confs/2030 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2031 b/test/confs/2031 index 5791316c1..d7e140844 100644 --- a/test/confs/2031 +++ b/test/confs/2031 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2032 b/test/confs/2032 index 002c31391..0ecd87b44 100644 --- a/test/confs/2032 +++ b/test/confs/2032 @@ -1,6 +1,7 @@ # Exim test configuration 2032 (close copy of 2002) exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2033 b/test/confs/2033 index 9ed671172..944c5e7ca 100644 --- a/test/confs/2033 +++ b/test/confs/2033 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2100 b/test/confs/2100 index dc8ec61ac..df56723d3 100644 --- a/test/confs/2100 +++ b/test/confs/2100 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2101 b/test/confs/2101 index a8de8c06d..c404caadd 100644 --- a/test/confs/2101 +++ b/test/confs/2101 @@ -4,6 +4,7 @@ OPTION= SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2102 b/test/confs/2102 index 804a846bf..cd711ddf2 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -1,6 +1,7 @@ # Exim test configuration 2102 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2103 b/test/confs/2103 index a9bc0ea7f..fc56df40d 100644 --- a/test/confs/2103 +++ b/test/confs/2103 @@ -1,6 +1,7 @@ # Exim test configuration 2103 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2104 b/test/confs/2104 index 610a5b722..8118ef889 100644 --- a/test/confs/2104 +++ b/test/confs/2104 @@ -1,6 +1,7 @@ # Exim test configuration 2104 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2105 b/test/confs/2105 index ec364a3c3..1b9444aa5 100644 --- a/test/confs/2105 +++ b/test/confs/2105 @@ -1,6 +1,7 @@ # Exim test configuration 2105 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2106 b/test/confs/2106 index d8c685eb5..1857f6c94 100644 --- a/test/confs/2106 +++ b/test/confs/2106 @@ -1,6 +1,7 @@ # Exim test configuration 2106 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2107 b/test/confs/2107 index b1e1967b7..34fb338bc 100644 --- a/test/confs/2107 +++ b/test/confs/2107 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2108 b/test/confs/2108 index 0388d0cc6..a32e7e46a 100644 --- a/test/confs/2108 +++ b/test/confs/2108 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2109 b/test/confs/2109 index 3e151936f..4987211e1 100644 --- a/test/confs/2109 +++ b/test/confs/2109 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2110 b/test/confs/2110 index 2bd3ed656..da67d097d 100644 --- a/test/confs/2110 +++ b/test/confs/2110 @@ -4,6 +4,7 @@ SERVER = HOSTS = 127.0.0.1 : HOSTIPV4 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2111 b/test/confs/2111 index 9abfc7a1a..d69f2a612 100644 --- a/test/confs/2111 +++ b/test/confs/2111 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2112 b/test/confs/2112 index cbd0babc6..8b0c2b7cd 100644 --- a/test/confs/2112 +++ b/test/confs/2112 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2113 b/test/confs/2113 index d9ac50447..3ba6bc620 100644 --- a/test/confs/2113 +++ b/test/confs/2113 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2114 b/test/confs/2114 index a2b1c526f..d856e98bc 100644 --- a/test/confs/2114 +++ b/test/confs/2114 @@ -3,6 +3,7 @@ CRL= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2115 b/test/confs/2115 index 8142100aa..f28f02260 100644 --- a/test/confs/2115 +++ b/test/confs/2115 @@ -1,6 +1,7 @@ # Exim test configuration 2115 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2116 b/test/confs/2116 index f5a9509e2..15e9085da 100644 --- a/test/confs/2116 +++ b/test/confs/2116 @@ -1,6 +1,7 @@ # Exim test configuration 2116 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/2117 b/test/confs/2117 index 8bf80f2b8..8a56c713d 100644 --- a/test/confs/2117 +++ b/test/confs/2117 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2118 b/test/confs/2118 index 7ddc16140..5d2d193f8 100644 --- a/test/confs/2118 +++ b/test/confs/2118 @@ -1,6 +1,7 @@ # Exim test configuration 2118 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2119 b/test/confs/2119 index 7d382d9ac..f4c228650 100644 --- a/test/confs/2119 +++ b/test/confs/2119 @@ -1,6 +1,7 @@ # Exim test configuration 2119 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2120 b/test/confs/2120 index c0225e819..e3a0ba1af 100644 --- a/test/confs/2120 +++ b/test/confs/2120 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" diff --git a/test/confs/2121 b/test/confs/2121 index a80e8efbb..b50ed1174 100644 --- a/test/confs/2121 +++ b/test/confs/2121 @@ -4,6 +4,7 @@ REQUIRE=# TRYCLEAR=# exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2122 b/test/confs/2122 index 510efdaab..477812e3c 100644 --- a/test/confs/2122 +++ b/test/confs/2122 @@ -1,6 +1,7 @@ # Exim test configuration 2122 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2123 b/test/confs/2123 index 507159c68..228add5d9 100644 --- a/test/confs/2123 +++ b/test/confs/2123 @@ -1,6 +1,7 @@ # Exim test configuration 2123 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2124 b/test/confs/2124 index 930f4b6d5..2809f6ce9 100644 --- a/test/confs/2124 +++ b/test/confs/2124 @@ -4,6 +4,7 @@ CERT=DIR/aux-fixed/cert1 TVC=/dev/null exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2125 b/test/confs/2125 index 20f8e1dfa..95b3f0d2d 100644 --- a/test/confs/2125 +++ b/test/confs/2125 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2126 b/test/confs/2126 index 3ea1d9c47..182895a19 100644 --- a/test/confs/2126 +++ b/test/confs/2126 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2127 b/test/confs/2127 index 786134cae..da7d2867f 100644 --- a/test/confs/2127 +++ b/test/confs/2127 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2128 b/test/confs/2128 index 3aa44e8ce..6b43541d5 100644 --- a/test/confs/2128 +++ b/test/confs/2128 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2130 b/test/confs/2130 index 6354b7cc3..6040c1fa6 100644 --- a/test/confs/2130 +++ b/test/confs/2130 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2131 b/test/confs/2131 index 3d83099d1..cb5c4a714 100644 --- a/test/confs/2131 +++ b/test/confs/2131 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2132 b/test/confs/2132 index 11dc3ce21..804cd749d 100644 --- a/test/confs/2132 +++ b/test/confs/2132 @@ -1,6 +1,7 @@ # Exim test configuration 2132 (close copy of 2102) exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2133 b/test/confs/2133 index 064a97acf..93ad43f04 100644 --- a/test/confs/2133 +++ b/test/confs/2133 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2149 b/test/confs/2149 index 1d649e952..810ab712a 100644 --- a/test/confs/2149 +++ b/test/confs/2149 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2150 b/test/confs/2150 index 3b27f41c9..50df137fb 100644 --- a/test/confs/2150 +++ b/test/confs/2150 @@ -1,6 +1,7 @@ # Exim test configuration 2150 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2200 b/test/confs/2200 index 3bef13363..47924c56a 100644 --- a/test/confs/2200 +++ b/test/confs/2200 @@ -1,6 +1,7 @@ # Exim test configuration 2200 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2201 b/test/confs/2201 index ae17b7cb4..dc01308e6 100644 --- a/test/confs/2201 +++ b/test/confs/2201 @@ -1,6 +1,7 @@ # Exim test configuration 2201 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2202 b/test/confs/2202 index 7380fb012..c25f0fb10 100644 --- a/test/confs/2202 +++ b/test/confs/2202 @@ -3,6 +3,7 @@ CONNECTCOND= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2250 b/test/confs/2250 index 8edb4ae88..b39f868c5 100644 --- a/test/confs/2250 +++ b/test/confs/2250 @@ -1,6 +1,7 @@ # Exim test configuration 2250 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2300 b/test/confs/2300 index dbfcc40ee..dd202b8a2 100644 --- a/test/confs/2300 +++ b/test/confs/2300 @@ -1,6 +1,7 @@ # Exim test configuration 2300 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2400 b/test/confs/2400 index 649688ff7..f2cb9a6c5 100644 --- a/test/confs/2400 +++ b/test/confs/2400 @@ -1,6 +1,7 @@ # Exim test configuration 2400 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2500 b/test/confs/2500 index 73f82edd2..6cbdff87e 100644 --- a/test/confs/2500 +++ b/test/confs/2500 @@ -1,6 +1,7 @@ # Exim test configuration 2500 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2501 b/test/confs/2501 index 11fc6acc7..6e0b6ece0 100644 --- a/test/confs/2501 +++ b/test/confs/2501 @@ -1,6 +1,7 @@ # Exim test configuration 2501 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/2600 b/test/confs/2600 index 11567569a..386f96c57 100644 --- a/test/confs/2600 +++ b/test/confs/2600 @@ -1,6 +1,7 @@ # Exim test configuration 2600 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3000 b/test/confs/3000 index 42e19cbe5..be0f51b5c 100644 --- a/test/confs/3000 +++ b/test/confs/3000 @@ -1,6 +1,7 @@ # Exim test configuration 3000 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/3100 b/test/confs/3100 index 4b319e091..70f767201 100644 --- a/test/confs/3100 +++ b/test/confs/3100 @@ -1,6 +1,7 @@ # Exim test configuration 3100 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/3200 b/test/confs/3200 index e86c6f90e..7e96d1590 100644 --- a/test/confs/3200 +++ b/test/confs/3200 @@ -1,6 +1,7 @@ # Exim test configuration 3200 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3201 b/test/confs/3201 index 53b274b90..a77f4711e 100644 --- a/test/confs/3201 +++ b/test/confs/3201 @@ -1,6 +1,7 @@ # Exim test configuration 3201 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3202 b/test/confs/3202 index ef4967e5e..2f560b124 100644 --- a/test/confs/3202 +++ b/test/confs/3202 @@ -1,6 +1,7 @@ # Exim test configuration 3202 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3203 b/test/confs/3203 index 79ace9ea3..39995c7b8 100644 --- a/test/confs/3203 +++ b/test/confs/3203 @@ -1,6 +1,7 @@ # Exim test configuration 3203 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3204 b/test/confs/3204 index 58ca672ca..139c06090 100644 --- a/test/confs/3204 +++ b/test/confs/3204 @@ -1,6 +1,7 @@ # Exim test configuration 3204 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3205 b/test/confs/3205 index d2f7ae5c9..554e1e2f2 100644 --- a/test/confs/3205 +++ b/test/confs/3205 @@ -1,6 +1,7 @@ # Exim test configuration 3205 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3206 b/test/confs/3206 index a0b4793db..982ac7666 100644 --- a/test/confs/3206 +++ b/test/confs/3206 @@ -1,6 +1,7 @@ # Exim test configuration 3206 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/3207 b/test/confs/3207 index 5229e514f..5156bd95f 100644 --- a/test/confs/3207 +++ b/test/confs/3207 @@ -1,6 +1,7 @@ # Exim test configuration 3207 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/3208 b/test/confs/3208 index 6bba1ed12..93fbe1820 100644 --- a/test/confs/3208 +++ b/test/confs/3208 @@ -1,6 +1,7 @@ # Exim test configuration 3208 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/3209 b/test/confs/3209 index 77db04192..3699de43e 100644 --- a/test/confs/3209 +++ b/test/confs/3209 @@ -1,6 +1,7 @@ # Exim test configuration 3209 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex qualify_domain = test.ex diff --git a/test/confs/3210 b/test/confs/3210 index ba9f3aa07..044a028d3 100644 --- a/test/confs/3210 +++ b/test/confs/3210 @@ -1,6 +1,7 @@ # Exim test configuration 3210 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3211 b/test/confs/3211 index 161e869e7..b4eac15d7 100644 --- a/test/confs/3211 +++ b/test/confs/3211 @@ -1,6 +1,7 @@ # Exim test configuration 3211 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3212 b/test/confs/3212 index e9d0bd60c..c56e23759 100644 --- a/test/confs/3212 +++ b/test/confs/3212 @@ -1,6 +1,7 @@ # Exim test configuration 3212 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3213 b/test/confs/3213 index 1237d295f..0c3d669b5 100644 --- a/test/confs/3213 +++ b/test/confs/3213 @@ -1,6 +1,7 @@ # Exim test configuration 3213 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3300 b/test/confs/3300 index 8b1764650..b20ee53fe 100644 --- a/test/confs/3300 +++ b/test/confs/3300 @@ -1,6 +1,7 @@ # Exim test configuration 3300 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3400 b/test/confs/3400 index 7ec7fc3be..496196daa 100644 --- a/test/confs/3400 +++ b/test/confs/3400 @@ -1,6 +1,7 @@ # Exim test configuration 3400 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3401 b/test/confs/3401 index 09b09edba..1e5f87fcb 100644 --- a/test/confs/3401 +++ b/test/confs/3401 @@ -1,6 +1,7 @@ # Exim test configuration 3401 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3402 b/test/confs/3402 index 299603537..d4c9dafeb 100644 --- a/test/confs/3402 +++ b/test/confs/3402 @@ -1,6 +1,7 @@ # Exim test configuration 3402 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3403 b/test/confs/3403 index 2f12a56f3..514e6e3f4 100644 --- a/test/confs/3403 +++ b/test/confs/3403 @@ -1,6 +1,7 @@ # Exim test configuration 3403 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3404 b/test/confs/3404 index c804d9386..74765a6bc 100644 --- a/test/confs/3404 +++ b/test/confs/3404 @@ -1,6 +1,7 @@ # Exim test configuration 3404 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3405 b/test/confs/3405 index 6b9718054..1ecd2a9bc 100644 --- a/test/confs/3405 +++ b/test/confs/3405 @@ -1,6 +1,7 @@ # Exim test configuration 3405 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3406 b/test/confs/3406 index 115133123..1dc7c9562 100644 --- a/test/confs/3406 +++ b/test/confs/3406 @@ -1,6 +1,7 @@ # Exim test configuration 3406 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3407 b/test/confs/3407 index 443376e6a..2c7d40735 100644 --- a/test/confs/3407 +++ b/test/confs/3407 @@ -3,6 +3,7 @@ OPTION=server_condition = xxx exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/3408 b/test/confs/3408 index c8b094073..2c8c6b6af 100644 --- a/test/confs/3408 +++ b/test/confs/3408 @@ -1,6 +1,7 @@ # Exim test configuration 3408 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/3409 b/test/confs/3409 index 11355fcec..d4726a73e 100644 --- a/test/confs/3409 +++ b/test/confs/3409 @@ -1,6 +1,7 @@ # Exim test configuration 3409 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/3410 b/test/confs/3410 index a102d40b6..3371b4e12 100644 --- a/test/confs/3410 +++ b/test/confs/3410 @@ -1,6 +1,7 @@ # Exim test configuration 3410 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3411 b/test/confs/3411 index 84a24166c..c7745e86b 100644 --- a/test/confs/3411 +++ b/test/confs/3411 @@ -1,6 +1,7 @@ # Exim test configuration 3411 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3412 b/test/confs/3412 index 09832d895..889256d98 100644 --- a/test/confs/3412 +++ b/test/confs/3412 @@ -1,6 +1,7 @@ # Exim test configuration 3412 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3413 b/test/confs/3413 index a6b76d16d..c3a682676 100644 --- a/test/confs/3413 +++ b/test/confs/3413 @@ -1,6 +1,7 @@ # Exim test configuration 3413 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3414 b/test/confs/3414 index 3b410c104..80fc96216 100644 --- a/test/confs/3414 +++ b/test/confs/3414 @@ -4,6 +4,7 @@ ACL= S= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3415 b/test/confs/3415 index 12be95e5b..47f3281c2 100644 --- a/test/confs/3415 +++ b/test/confs/3415 @@ -5,6 +5,7 @@ SUBMISSION_OPTIONS= AUTH_ID_DOMAIN= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3416 b/test/confs/3416 index 6785dede0..2b3f2afaf 100644 --- a/test/confs/3416 +++ b/test/confs/3416 @@ -2,6 +2,7 @@ # Recipient callout with AUTH exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3450 b/test/confs/3450 index 26a277a98..19e3a6b27 100644 --- a/test/confs/3450 +++ b/test/confs/3450 @@ -1,6 +1,7 @@ # Exim test configuration 3450 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3451 b/test/confs/3451 index 052469d14..1c0a478cd 100644 --- a/test/confs/3451 +++ b/test/confs/3451 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3452 b/test/confs/3452 index 6e411f521..b36e1fa04 100644 --- a/test/confs/3452 +++ b/test/confs/3452 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3453 b/test/confs/3453 index 0a2a068a7..199db1590 100644 --- a/test/confs/3453 +++ b/test/confs/3453 @@ -3,6 +3,7 @@ REMEMBER=false exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3454 b/test/confs/3454 index 727a71d86..b45b9183c 100644 --- a/test/confs/3454 +++ b/test/confs/3454 @@ -1,6 +1,7 @@ # Exim test configuration 3454 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3455 b/test/confs/3455 index cf7caed4f..3d33fb650 100644 --- a/test/confs/3455 +++ b/test/confs/3455 @@ -3,6 +3,7 @@ HOSTS_AVOID_TLS= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3460 b/test/confs/3460 index 59da15cb8..84e585a5c 100644 --- a/test/confs/3460 +++ b/test/confs/3460 @@ -1,6 +1,7 @@ # Exim test configuration 3460 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3461 b/test/confs/3461 index c93abddd7..45a28fd62 100644 --- a/test/confs/3461 +++ b/test/confs/3461 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3462 b/test/confs/3462 index f21651e5e..10b6cb952 100644 --- a/test/confs/3462 +++ b/test/confs/3462 @@ -3,6 +3,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3463 b/test/confs/3463 index 1933b8a48..f6228f979 100644 --- a/test/confs/3463 +++ b/test/confs/3463 @@ -3,6 +3,7 @@ REMEMBER=false exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3464 b/test/confs/3464 index 79f0df297..7f2d2777d 100644 --- a/test/confs/3464 +++ b/test/confs/3464 @@ -1,6 +1,7 @@ # Exim test configuration 3464 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3465 b/test/confs/3465 index 9486f5016..1b73148cc 100644 --- a/test/confs/3465 +++ b/test/confs/3465 @@ -3,6 +3,7 @@ HOSTS_AVOID_TLS= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3500 b/test/confs/3500 index 8853e9440..571a43bd8 100644 --- a/test/confs/3500 +++ b/test/confs/3500 @@ -1,6 +1,7 @@ # Exim test configuration 3500 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3501 b/test/confs/3501 index 521bb789f..fbcf2db22 100644 --- a/test/confs/3501 +++ b/test/confs/3501 @@ -1,6 +1,7 @@ # Exim test configuration 3501 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3600 b/test/confs/3600 index c37ccf14d..50dc99780 100644 --- a/test/confs/3600 +++ b/test/confs/3600 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/3700 b/test/confs/3700 index 1565b5f79..667131e3f 100644 --- a/test/confs/3700 +++ b/test/confs/3700 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4000 b/test/confs/4000 index 822f15f78..3f757e018 100644 --- a/test/confs/4000 +++ b/test/confs/4000 @@ -1,6 +1,7 @@ # Exim test configuration 4000 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4001 b/test/confs/4001 index 00406b4ee..96ac7104f 100644 --- a/test/confs/4001 +++ b/test/confs/4001 @@ -2,6 +2,7 @@ # Content-scan: f-protd interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4002 b/test/confs/4002 index cc0d05ebb..496c4527f 100644 --- a/test/confs/4002 +++ b/test/confs/4002 @@ -2,6 +2,7 @@ # Content-scan: aveserver interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4003 b/test/confs/4003 index 7fbd61ba0..dc10a6aca 100644 --- a/test/confs/4003 +++ b/test/confs/4003 @@ -2,6 +2,7 @@ # Content-scan: fsecure interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4004 b/test/confs/4004 index 84471acac..9adcaf95b 100644 --- a/test/confs/4004 +++ b/test/confs/4004 @@ -2,6 +2,7 @@ # Content-scan: sophie interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4005 b/test/confs/4005 index fd15dfc04..933f81e99 100644 --- a/test/confs/4005 +++ b/test/confs/4005 @@ -5,6 +5,7 @@ OPT= CONTROL= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4006 b/test/confs/4006 index 8ac65a584..963714f7e 100644 --- a/test/confs/4006 +++ b/test/confs/4006 @@ -2,6 +2,7 @@ # Content-scan: avast interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4007 b/test/confs/4007 index 110a590f0..7fecb965a 100644 --- a/test/confs/4007 +++ b/test/confs/4007 @@ -2,6 +2,7 @@ # Content-scan: cmsline interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4008 b/test/confs/4008 index 55c290333..64be4d590 100644 --- a/test/confs/4008 +++ b/test/confs/4008 @@ -2,6 +2,7 @@ # Content-scan: rspamd interface exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4009 b/test/confs/4009 index 2799575ea..64d23053c 100644 --- a/test/confs/4009 +++ b/test/confs/4009 @@ -4,6 +4,7 @@ OPT= 127.0.0.1 7833 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4020 b/test/confs/4020 index 8a3a91fcc..4b355a046 100644 --- a/test/confs/4020 +++ b/test/confs/4020 @@ -3,7 +3,8 @@ OPT = exim_path = EXIM_PATH -host_lookup_order = bydns +keep_environment = +hide host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/4028 b/test/confs/4028 index 3174e7543..de11185bb 100644 --- a/test/confs/4028 +++ b/test/confs/4028 @@ -5,6 +5,7 @@ OPT = SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4029 b/test/confs/4029 index ae4e71850..b8f7ec45a 100644 --- a/test/confs/4029 +++ b/test/confs/4029 @@ -5,6 +5,7 @@ OPT = SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/4100 b/test/confs/4100 index 180c6f4d3..9fac4d951 100644 --- a/test/confs/4100 +++ b/test/confs/4100 @@ -1,6 +1,7 @@ # Exim test configuration 4100 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/4200 b/test/confs/4200 index c0bf41aa8..ad9dd1470 100644 --- a/test/confs/4200 +++ b/test/confs/4200 @@ -1,6 +1,7 @@ # Exim test configuration 4200 exim_path = EXIM_PATH +keep_environment = spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog gecos_name = CALLER_NAME diff --git a/test/confs/4201 b/test/confs/4201 index 6a16f4c6f..c6f18ed21 100644 --- a/test/confs/4201 +++ b/test/confs/4201 @@ -7,6 +7,7 @@ INSERT = SUB = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/4211 b/test/confs/4211 index 085fecc72..a5cc47ad1 100644 --- a/test/confs/4211 +++ b/test/confs/4211 @@ -5,6 +5,7 @@ OPTION = * CONTROL = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/4221 b/test/confs/4221 index 085fecc72..a5cc47ad1 100644 --- a/test/confs/4221 +++ b/test/confs/4221 @@ -5,6 +5,7 @@ OPTION = * CONTROL = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/4800 b/test/confs/4800 index a257eff41..8a343d8e5 100644 --- a/test/confs/4800 +++ b/test/confs/4800 @@ -1,3 +1,6 @@ +# exim test configuration 4800 +exim_path = EXIM_PATH +keep_environment = begin routers dnslookup: diff --git a/test/confs/4801 b/test/confs/4801 index 86ec20698..ea22dc4d1 100644 --- a/test/confs/4801 +++ b/test/confs/4801 @@ -1,3 +1,6 @@ +# exim test configuration 4801 +exim_path = EXIM_PATH +keep_environment = begin routers dnslookup: diff --git a/test/confs/4803 b/test/confs/4803 index fa18e2c32..607cb309f 100644 --- a/test/confs/4803 +++ b/test/confs/4803 @@ -1,3 +1,6 @@ +# exim test configuration 4803 +exim_path = EXIM_PATH +keep_environment = dns_trust_aa = * begin routers diff --git a/test/confs/4950 b/test/confs/4950 index 373aafe2b..24652dd00 100644 --- a/test/confs/4950 +++ b/test/confs/4950 @@ -1,6 +1,7 @@ # Exim test configuration 4950 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5000 b/test/confs/5000 index f46ba25a7..93b00309f 100644 --- a/test/confs/5000 +++ b/test/confs/5000 @@ -1,6 +1,7 @@ # Exim test configuration 5000 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5001 b/test/confs/5001 index 9e497261d..c26642338 100644 --- a/test/confs/5001 +++ b/test/confs/5001 @@ -1,6 +1,7 @@ # Exim test configuration 5001 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5002 b/test/confs/5002 index a21bd7a82..8dd7bf26d 100644 --- a/test/confs/5002 +++ b/test/confs/5002 @@ -1,6 +1,7 @@ # Exim test configuration 5002 exim_path = EXIM_PATH +keep_environment = primary_hostname = myhost.test.ex host_lookup_order = bydns spool_directory = DIR/spool diff --git a/test/confs/5003 b/test/confs/5003 index 1c0d7639d..d3b0c25d3 100644 --- a/test/confs/5003 +++ b/test/confs/5003 @@ -1,6 +1,7 @@ # Exim test configuration 5003 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5004 b/test/confs/5004 index eb1a874d9..7df0fc8c8 100644 --- a/test/confs/5004 +++ b/test/confs/5004 @@ -1,6 +1,7 @@ # Exim test configuration 5004 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5005 b/test/confs/5005 index d38387a9e..19c4a4a82 100644 --- a/test/confs/5005 +++ b/test/confs/5005 @@ -3,6 +3,7 @@ QUOTA=500 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5006 b/test/confs/5006 index 24f0361ea..b5c341804 100644 --- a/test/confs/5006 +++ b/test/confs/5006 @@ -1,6 +1,7 @@ # Exim test configuration 5006 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5007 b/test/confs/5007 index 59df86783..836ad2aff 100644 --- a/test/confs/5007 +++ b/test/confs/5007 @@ -3,6 +3,7 @@ QUOTA=500 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5008 b/test/confs/5008 index a9e7a7246..e34bcea9c 100644 --- a/test/confs/5008 +++ b/test/confs/5008 @@ -3,6 +3,7 @@ QUOTA_FILECOUNT=0 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5009 b/test/confs/5009 index 8da6c6e1b..779773f89 100644 --- a/test/confs/5009 +++ b/test/confs/5009 @@ -3,6 +3,7 @@ SUB= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5050 b/test/confs/5050 index acda86a55..38c2e8f94 100644 --- a/test/confs/5050 +++ b/test/confs/5050 @@ -1,6 +1,7 @@ # Exim test configuration 5050 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5100 b/test/confs/5100 index 4f4df39de..4005e853d 100644 --- a/test/confs/5100 +++ b/test/confs/5100 @@ -3,6 +3,7 @@ IGNORE_QUOTA=FALSE exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5101 b/test/confs/5101 index a3bd84f91..4d1706c41 100644 --- a/test/confs/5101 +++ b/test/confs/5101 @@ -1,6 +1,7 @@ # Exim test configuration 5101 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5102 b/test/confs/5102 index 8d69e3b20..5af90f677 100644 --- a/test/confs/5102 +++ b/test/confs/5102 @@ -1,6 +1,7 @@ # Exim test configuration 5102 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5103 b/test/confs/5103 index e195052e0..0714ba3c0 100644 --- a/test/confs/5103 +++ b/test/confs/5103 @@ -1,6 +1,7 @@ # Exim test configuration 5103 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5200 b/test/confs/5200 index aa9997b7f..03da6fda2 100644 --- a/test/confs/5200 +++ b/test/confs/5200 @@ -1,6 +1,7 @@ # Exim test configuration 5200 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5201 b/test/confs/5201 index 58af62e6c..fe77484b1 100644 --- a/test/confs/5201 +++ b/test/confs/5201 @@ -1,6 +1,7 @@ # Exim test configuration 5201 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5202 b/test/confs/5202 index 87bc9d0af..5752e178c 100644 --- a/test/confs/5202 +++ b/test/confs/5202 @@ -1,6 +1,7 @@ # Exim test configuration 5202 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5203 b/test/confs/5203 index 0a11110b3..5d951bd26 100644 --- a/test/confs/5203 +++ b/test/confs/5203 @@ -1,6 +1,7 @@ # Exim test configuration 5203 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5204 b/test/confs/5204 index 5cf753aeb..ca97ea6e4 100644 --- a/test/confs/5204 +++ b/test/confs/5204 @@ -3,6 +3,7 @@ COMMAND_USER=EXIMUSER exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5205 b/test/confs/5205 index 5048b1d59..3b715473a 100644 --- a/test/confs/5205 +++ b/test/confs/5205 @@ -1,6 +1,7 @@ # Exim test configuration 5205 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5206 b/test/confs/5206 index 7d1c56253..b7c7ae0b8 100644 --- a/test/confs/5206 +++ b/test/confs/5206 @@ -1,6 +1,7 @@ # Exim test configuration 5206 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5207 b/test/confs/5207 index 4fb4f767e..373b18626 100644 --- a/test/confs/5207 +++ b/test/confs/5207 @@ -1,6 +1,7 @@ # Exim test configuration 5207 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5208 b/test/confs/5208 index 1cd500ff7..3ee81df83 100644 --- a/test/confs/5208 +++ b/test/confs/5208 @@ -4,6 +4,7 @@ LIST= SELF=freeze exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5209 b/test/confs/5209 index 21e27390d..2b2121ec8 100644 --- a/test/confs/5209 +++ b/test/confs/5209 @@ -1,6 +1,7 @@ # Exim test configuration 5209 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5300 b/test/confs/5300 index 70de5631c..7840341a3 100644 --- a/test/confs/5300 +++ b/test/confs/5300 @@ -3,6 +3,7 @@ ALLOW=true exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5301 b/test/confs/5301 index 0c130a04f..25caa299c 100644 --- a/test/confs/5301 +++ b/test/confs/5301 @@ -3,6 +3,7 @@ D6= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5400 b/test/confs/5400 index 79465df80..e7a5c074f 100644 --- a/test/confs/5400 +++ b/test/confs/5400 @@ -1,6 +1,7 @@ # Exim test configuration 5400 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5401 b/test/confs/5401 index 5978b7fa0..917c4ea76 100644 --- a/test/confs/5401 +++ b/test/confs/5401 @@ -1,6 +1,7 @@ # Exim test configuration 5401 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5410 b/test/confs/5410 index 735b52932..4c59adb95 100644 --- a/test/confs/5410 +++ b/test/confs/5410 @@ -1,6 +1,7 @@ # Exim test configuration 5410 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5420 b/test/confs/5420 index f8379c7bd..bb559116e 100644 --- a/test/confs/5420 +++ b/test/confs/5420 @@ -1,6 +1,7 @@ # Exim test configuration 5420 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5500 b/test/confs/5500 index 6b9e328ba..5369bf6fd 100644 --- a/test/confs/5500 +++ b/test/confs/5500 @@ -4,6 +4,7 @@ LOG_SELECTOR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5510 b/test/confs/5510 index 083394ee5..fb7d404ac 100644 --- a/test/confs/5510 +++ b/test/confs/5510 @@ -4,6 +4,7 @@ LOG_SELECTOR= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5600 b/test/confs/5600 index 2dc1090df..c05bcfcf9 100644 --- a/test/confs/5600 +++ b/test/confs/5600 @@ -4,6 +4,7 @@ CRL= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = server1.example.com spool_directory = DIR/spool diff --git a/test/confs/5601 b/test/confs/5601 index 785f0c64f..267f4e071 100644 --- a/test/confs/5601 +++ b/test/confs/5601 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$ host_lookup_order = bydns primary_hostname = server1.example.com spool_directory = DIR/spool diff --git a/test/confs/5608 b/test/confs/5608 index 311cc1299..32b4e5f81 100644 --- a/test/confs/5608 +++ b/test/confs/5608 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$ host_lookup_order = bydns primary_hostname = server1.example.com spool_directory = DIR/spool diff --git a/test/confs/5650 b/test/confs/5650 index bf4462be3..8d07b7a9c 100644 --- a/test/confs/5650 +++ b/test/confs/5650 @@ -4,6 +4,7 @@ CRL= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = server1.example.com spool_directory = DIR/spool diff --git a/test/confs/5651 b/test/confs/5651 index cffa4107c..fe9d3bceb 100644 --- a/test/confs/5651 +++ b/test/confs/5651 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = server1.example.com spool_directory = DIR/spool diff --git a/test/confs/5658 b/test/confs/5658 index 10938e1f9..63b462313 100644 --- a/test/confs/5658 +++ b/test/confs/5658 @@ -4,6 +4,7 @@ SERVER = exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = server1.example.com spool_directory = DIR/spool diff --git a/test/confs/5700 b/test/confs/5700 index 4d0abea55..bc2cf347e 100644 --- a/test/confs/5700 +++ b/test/confs/5700 @@ -1,6 +1,7 @@ # Exim test configuration 5700 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/5750 b/test/confs/5750 index 13ee1498f..3a66364d0 100644 --- a/test/confs/5750 +++ b/test/confs/5750 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5760 b/test/confs/5760 index 303420f3d..4a6152402 100644 --- a/test/confs/5760 +++ b/test/confs/5760 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5800 b/test/confs/5800 index 66facecb3..ba4db9ab6 100644 --- a/test/confs/5800 +++ b/test/confs/5800 @@ -2,6 +2,7 @@ # DANE common exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5820 b/test/confs/5820 index 1b487026f..9ee830910 100644 --- a/test/confs/5820 +++ b/test/confs/5820 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5840 b/test/confs/5840 index 4f468a384..e83919005 100644 --- a/test/confs/5840 +++ b/test/confs/5840 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/5860 b/test/confs/5860 index d3f6db3c4..eae2edb0d 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -4,6 +4,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9000 b/test/confs/9000 index 8f55b92e2..695d1d17b 100644 --- a/test/confs/9000 +++ b/test/confs/9000 @@ -3,6 +3,7 @@ LDAPSERVERS= exim_path = EXIM_PATH +keep_environment = LDAPTLS_REQCERT host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9001 b/test/confs/9001 index 3f0b52362..be3d2c121 100644 --- a/test/confs/9001 +++ b/test/confs/9001 @@ -1,6 +1,7 @@ # Exim test configuration 9001 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9100 b/test/confs/9100 index 0285c801a..564d38847 100644 --- a/test/confs/9100 +++ b/test/confs/9100 @@ -1,6 +1,7 @@ # Exim test configuration 9100 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9200 b/test/confs/9200 index 1aac8b102..6a07be672 100644 --- a/test/confs/9200 +++ b/test/confs/9200 @@ -3,6 +3,7 @@ SERVERS=localhost/test/ph10/ exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9300 b/test/confs/9300 index 05e88414d..0c559f59b 100644 --- a/test/confs/9300 +++ b/test/confs/9300 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9350 b/test/confs/9350 index e312ee609..f3baf2bbe 100644 --- a/test/confs/9350 +++ b/test/confs/9350 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9400 b/test/confs/9400 index 32fe5c90b..815139cc9 100644 --- a/test/confs/9400 +++ b/test/confs/9400 @@ -1,6 +1,7 @@ # Exim test configuration 9400 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9401 b/test/confs/9401 index cbd030fbe..234a672db 100644 --- a/test/confs/9401 +++ b/test/confs/9401 @@ -1,6 +1,7 @@ # Exim test configuration 9401 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/9402 b/test/confs/9402 index 65f8926c3..c80c6cb30 100644 --- a/test/confs/9402 +++ b/test/confs/9402 @@ -3,6 +3,7 @@ SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9450 b/test/confs/9450 index 43fbde00c..205bb9146 100644 --- a/test/confs/9450 +++ b/test/confs/9450 @@ -1,6 +1,7 @@ # Exim test configuration 9450 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9900 b/test/confs/9900 index eba2f900c..d4572109f 100644 --- a/test/confs/9900 +++ b/test/confs/9900 @@ -1,6 +1,7 @@ # Exim test configuration 9900 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/9901 b/test/confs/9901 index a49153ba0..39a966edb 100644 --- a/test/confs/9901 +++ b/test/confs/9901 @@ -4,6 +4,7 @@ COM= SERVER= exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns primary_hostname = myhost.test.ex spool_directory = DIR/spool diff --git a/test/confs/9902 b/test/confs/9902 index b252c4cbb..4c41d8c5f 100644 --- a/test/confs/9902 +++ b/test/confs/9902 @@ -5,6 +5,7 @@ ORDER= exim_path = EXIM_PATH +keep_environment = primary_hostname = myhost.test.ex spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/confs/9903 b/test/confs/9903 index 39db98713..6ecff0822 100644 --- a/test/confs/9903 +++ b/test/confs/9903 @@ -1,6 +1,7 @@ # Exim test configuration 9903 exim_path = EXIM_PATH +keep_environment = host_lookup_order = bydns spool_directory = DIR/spool log_file_path = DIR/spool/log/%slog diff --git a/test/paniclog/0013 b/test/paniclog/0013 index c9eb6412c..74c607a1b 100644 --- a/test/paniclog/0013 +++ b/test/paniclog/0013 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 14 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config: extra characters follow string value for relay_hosts diff --git a/test/paniclog/0148 b/test/paniclog/0148 index a2e75ff50..d9985aabd 100644 --- a/test/paniclog/0148 +++ b/test/paniclog/0148 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 18 of TESTSUITE/test-config: missing quote at end of string value for hold_domains diff --git a/test/paniclog/0236 b/test/paniclog/0236 index 003f31154..6b472bcd8 100644 --- a/test/paniclog/0236 +++ b/test/paniclog/0236 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 14 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config: macro name too long (maximum is 63 characters) diff --git a/test/paniclog/0290 b/test/paniclog/0290 index b519863d3..40585c690 100644 --- a/test/paniclog/0290 +++ b/test/paniclog/0290 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 28 of TESTSUITE/test-config: .include specifies a non-absolute path "non/absolute" diff --git a/test/paniclog/0348 b/test/paniclog/0348 index f901fd4cf..d18082f4c 100644 --- a/test/paniclog/0348 +++ b/test/paniclog/0348 @@ -1,8 +1,8 @@ -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule diff --git a/test/paniclog/0415 b/test/paniclog/0415 index 7ead00c8e..4e5fcc9c6 100644 --- a/test/paniclog/0415 +++ b/test/paniclog/0415 @@ -1,20 +1,20 @@ -1999-03-02 09:44:33 Exim configuration error in line 19 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config: absolute value of integer "4000000M" is too large (overflow) -1999-03-02 09:44:33 Exim configuration error in line 19 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config: extra characters follow integer value for check_spool_space -1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: integer "4000000000.123" is too large (overflow) -1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config: - integer "4000000.123" is too large (overflow) 1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: + integer "4000000.123" is too large (overflow) +1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: absolute value of integer "999999999999999999" is too large (overflow) -1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: absolute value of integer "999999999K" is too large (overflow) -1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: absolute value of integer "999999M" is too large (overflow) -1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: extra characters follow integer value for finduser_retries -1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: integer expected for finduser_retries -1999-03-02 09:44:33 Exim configuration error in line 22 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: extra characters follow integer value for finduser_retries diff --git a/test/paniclog/0442 b/test/paniclog/0442 index 2dd90dd48..f8afd85ea 100644 --- a/test/paniclog/0442 +++ b/test/paniclog/0442 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 42 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config: failed to open included configuration file /non/existent diff --git a/test/runtest b/test/runtest index fcc7a972e..b201d1cfa 100755 --- a/test/runtest +++ b/test/runtest @@ -348,7 +348,7 @@ $spid = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"; # that are specific to certain file types, though there are also some of those # inline too. -while(<IN>) +LINE: while(<IN>) { RESET_AFTER_EXTRA_LINE_READ: # Custom munges @@ -563,6 +563,25 @@ RESET_AFTER_EXTRA_LINE_READ: # signature algorithm names s/RSA-SHA1/RSA-SHA/; + # -d produces a list of environement variables as they are checked if they exist in the + # in the environment. Unfortunately this list isn't always in the same order. For now we + # just remove this list + # + if (/^\w+ in keep_environment/) + { + my @lines = $_; + while (<IN>) + { + if (/^\w+ in keep_environment/) + { + push @lines, $_; + next; + } + print MUNGED sort grep { !/^(SHLVL|_) / } @lines; + redo LINE; + } + } + # ======== Caller's login, uid, gid, home, gecos ======== @@ -1659,6 +1678,8 @@ my($commandnameref) = $_[3]; my($aux_info) = $_[4]; my($yield) = 1; +our %ENV = map { $_ => $ENV{$_} } grep { /^(?:USER|SHELL|PATH|TERM|EXIM_TEST_.*)$/ } keys %ENV; + if (/^(\d+)\s*$/) # Handle unusual return code { my($r) = $_[2]; @@ -2062,12 +2083,12 @@ if (/^client/ || /^(sudo\s+)?perl\b/) # not drop privilege when -C and -D options are present. To run the exim # command as root, we use sudo. -elsif (/^([A-Z_]+=\S+\s+)?(\d+)?\s*(sudo\s+)?exim(_\S+)?\s+(.*)$/) +elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+)?\s+(.*)$/) { - $args = $5; + $args = $6; my($envset) = (defined $1)? $1 : ""; - my($sudo) = (defined $3)? "sudo " : ""; - my($special)= (defined $4)? $4 : ""; + my($sudo) = (defined $3)? "sudo " . (defined $4 ? "-u $4 ":"") : ""; + my($special)= (defined $5)? $5 : ""; $wait_time = (defined $2)? $2 : 0; # Return 2 rather than 1 afterwards diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615 new file mode 100644 index 000000000..9057363f3 --- /dev/null +++ b/test/scripts/0000-Basic/0615 @@ -0,0 +1,13 @@ +# Environment +# settings +FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP keep_environment add_environment +**** +# result via -bP enviroment +FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -bP environment +**** +# result via -n -bP enviroment +FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -n -bP environment +**** +# result via perl_at_start +FOO=foo FOO1=foo1 FOO2=foo2 BAR=bar BAR1=bar1 BAR2=bar2 exim -ps -be '' +*** diff --git a/test/scripts/0000-Basic/0616 b/test/scripts/0000-Basic/0616 new file mode 120000 index 000000000..122707d0a --- /dev/null +++ b/test/scripts/0000-Basic/0616 @@ -0,0 +1 @@ +0615
\ No newline at end of file diff --git a/test/stderr/0002 b/test/stderr/0002 index b4f06a104..c19ce9ce3 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -130,6 +130,11 @@ expanding: -oMt sender_ident = $sender_ident Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp +PATH in keep_environment? no (end of list) +PWD in keep_environment? no (end of list) +SHELL in keep_environment? no (end of list) +TERM in keep_environment? no (end of list) +USER in keep_environment? yes (matched "USER") configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -189,6 +194,11 @@ search_tidyup called Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp +PATH in keep_environment? no (end of list) +PWD in keep_environment? no (end of list) +SHELL in keep_environment? no (end of list) +TERM in keep_environment? no (end of list) +USER in keep_environment? yes (matched "USER") configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed @@ -373,6 +383,11 @@ LOG: 10HmbD-0005vi-00 H=[V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=pppp +PATH in keep_environment? no (end of list) +PWD in keep_environment? no (end of list) +SHELL in keep_environment? no (end of list) +TERM in keep_environment? no (end of list) +USER in keep_environment? yes (matched "USER") configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME diff --git a/test/stderr/0013 b/test/stderr/0013 index c9eb6412c..74c607a1b 100644 --- a/test/stderr/0013 +++ b/test/stderr/0013 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 14 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 16 of TESTSUITE/test-config: extra characters follow string value for relay_hosts diff --git a/test/stderr/0148 b/test/stderr/0148 index d9ba230b1..f7153995d 100644 --- a/test/stderr/0148 +++ b/test/stderr/0148 @@ -1,3 +1,3 @@ LOG: PANIC DIE - Exim configuration error in line 16 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: missing quote at end of string value for hold_domains diff --git a/test/stderr/0236 b/test/stderr/0236 index f8a4205d4..75ed334bf 100644 --- a/test/stderr/0236 +++ b/test/stderr/0236 @@ -1,3 +1,3 @@ LOG: PANIC DIE - Exim configuration error in line 14 of TESTSUITE/test-config: + Exim configuration error in line 16 of TESTSUITE/test-config: macro name too long (maximum is 63 characters) diff --git a/test/stderr/0290 b/test/stderr/0290 index 4aed074e0..729780b71 100644 --- a/test/stderr/0290 +++ b/test/stderr/0290 @@ -1,3 +1,3 @@ LOG: PANIC DIE - Exim configuration error in line 26 of TESTSUITE/test-config: + Exim configuration error in line 28 of TESTSUITE/test-config: .include specifies a non-absolute path "non/absolute" diff --git a/test/stderr/0348 b/test/stderr/0348 index f901fd4cf..d18082f4c 100644 --- a/test/stderr/0348 +++ b/test/stderr/0348 @@ -1,8 +1,8 @@ -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 24 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 26 of TESTSUITE/test-config: bad parameters for retry rule diff --git a/test/stderr/0415 b/test/stderr/0415 index b593b1bc8..95b5e7f5e 100644 --- a/test/stderr/0415 +++ b/test/stderr/0415 @@ -1,30 +1,30 @@ LOG: PANIC DIE - Exim configuration error in line 19 of TESTSUITE/test-config: + Exim configuration error in line 21 of TESTSUITE/test-config: absolute value of integer "4000000M" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 19 of TESTSUITE/test-config: + Exim configuration error in line 21 of TESTSUITE/test-config: extra characters follow integer value for check_spool_space LOG: PANIC DIE - Exim configuration error in line 20 of TESTSUITE/test-config: + Exim configuration error in line 22 of TESTSUITE/test-config: integer "4000000000.123" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 20 of TESTSUITE/test-config: + Exim configuration error in line 22 of TESTSUITE/test-config: integer "4000000.123" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 22 of TESTSUITE/test-config: + Exim configuration error in line 24 of TESTSUITE/test-config: absolute value of integer "999999999999999999" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 22 of TESTSUITE/test-config: + Exim configuration error in line 24 of TESTSUITE/test-config: absolute value of integer "999999999K" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 22 of TESTSUITE/test-config: + Exim configuration error in line 24 of TESTSUITE/test-config: absolute value of integer "999999M" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 22 of TESTSUITE/test-config: + Exim configuration error in line 24 of TESTSUITE/test-config: extra characters follow integer value for finduser_retries LOG: PANIC DIE - Exim configuration error in line 22 of TESTSUITE/test-config: + Exim configuration error in line 24 of TESTSUITE/test-config: integer expected for finduser_retries LOG: PANIC DIE - Exim configuration error in line 22 of TESTSUITE/test-config: + Exim configuration error in line 24 of TESTSUITE/test-config: extra characters follow integer value for finduser_retries diff --git a/test/stderr/0442 b/test/stderr/0442 index 2dd90dd48..f8afd85ea 100644 --- a/test/stderr/0442 +++ b/test/stderr/0442 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 42 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 44 of TESTSUITE/test-config: failed to open included configuration file /non/existent diff --git a/test/stderr/0615 b/test/stderr/0615 new file mode 100644 index 000000000..85ee6f760 --- /dev/null +++ b/test/stderr/0615 @@ -0,0 +1,15 @@ +LOG: MAIN + WARNING: purging the environment. + Suggested action: use keep_environment and add_environment. + +LOG: MAIN + WARNING: purging the environment. + Suggested action: use keep_environment and add_environment. + +LOG: MAIN + WARNING: purging the environment. + Suggested action: use keep_environment and add_environment. + +1999-03-02 09:44:33 WARNING: purging the environment. + Suggested action: use keep_environment and add_environment. + diff --git a/test/stdout/0615 b/test/stdout/0615 new file mode 100644 index 000000000..58d5d0e37 --- /dev/null +++ b/test/stdout/0615 @@ -0,0 +1,4 @@ +keep_environment = +add_environment = +Environment visible in Perl: + diff --git a/test/stdout/0616 b/test/stdout/0616 new file mode 100644 index 000000000..8ba67bb34 --- /dev/null +++ b/test/stdout/0616 @@ -0,0 +1,19 @@ +keep_environment = ^FOO\d : BAR +add_environment = ADDED1=added1 : ADDED2=added2 +ADDED1=added1 +ADDED2=added2 +BAR=bar +FOO1=foo1 +FOO2=foo2 +ADDED1 +ADDED2 +BAR +FOO1 +FOO2 +Environment visible in Perl: +ADDED1=added1 +ADDED2=added2 +BAR=bar +FOO1=foo1 +FOO2=foo2 + |