Merge branch 'master'

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 673cdf250fcfbc3df28164bad82b9f8530d83d85..799104ec438c606d2544e52c4ac3ee0ed0e350a1 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -3151,6 +3151,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
@@ -3482,6 +3487,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.
@@ -7739,7 +7746,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
@@ -13947,6 +13954,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
@@ -15034,6 +15049,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
@@ -16072,6 +16111,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,
+
 
 .option slow_lookup_log main integer 0
 .cindex "logging" "slow lookups"

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2f39532e7e23150d78d29fb4dbbd613aab42139d..7f8a6254678ea190febad54e0b9f20847a0a2331 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -173,6 +173,7 @@ JH/41 Bug 1792: Fix selection of headers to sign for DKIM: bottom-up.  While
 
 JH/42 Bug 1796: Fix error logged on a malware scanner connection failure.
 
+HS/04 Add support for keep_environment and add_environment options.
 
 
 Exim version 4.86

diff --git a/release-process/scripts/mk_exim_release.pl b/release-process/scripts/mk_exim_release.pl
index 995720e2c188110fad9afd69100bd4e04660844b..553ea95a9fe8a1e20f12193c005f83051f0b6c6f 100755 (executable)
--- a/release-process/scripts/mk_exim_release.pl
+++ b/release-process/scripts/mk_exim_release.pl
@@ -22,16 +22,15 @@ sub get_and_check_version {
     my $context = shift;
 
     # make sure this looks like a real release version
-    # which should (currently) be 4.xx or 4.xx_RCx
-    unless ( $release =~ /^(4\.\d\d(?:_RC\d+)?)$/ ) {
+    # which should (currently) be 4.xx[.y] or 4.xx[.y]_RCx
+    unless ( $release =~ /^(?<release>(?<major>4\.\d\d)(?:\.(?<minor>\d+))?(?:_RC\d+)?)$/ ) {
         croak "The given version number does not look right - $release";
     }
-    my $full_release  = $1;              # untainted here...
-    my $trunc_release = $full_release;
-    $trunc_release =~ s/^(4\.\d\d)(?:_RC\d+)?$/$1/;
+    $context->{release}  = $+{release};
+    $context->{major} = $+{major};
+    $context->{minor} = $+{minor};
 
-    $context->{release}  = $full_release;
-    $context->{trelease} = $trunc_release;
+    ($context->{trelease} = $+{release}) =~ s/_RC\d+//;
 }
 
 # ------------------------------------------------------------------
@@ -87,7 +86,6 @@ sub export_git_tree {
     my $archive_file = sprintf( '%s/%s-%s.tar', $context->{tmp}, $context->{pkgname}, $context->{release} );
     $context->{tmp_archive_file} = $archive_file;
     my @cmd = ( 'git', 'archive', '--format=tar', "--output=$archive_file", $context->{tag} );
-
     # run git command
     print( "Running: ", join( ' ', @cmd ), "\n" ) if ($verbose);
     system(@cmd) == 0 || croak "Export failed";
@@ -124,13 +122,37 @@ sub make_version_script {
         return;
     }
 
-    my @cmd = ("../scripts/reversion", "release");
+    # Currently (25. Feb. 2016) the mk_exim_release.pl up to now can't
+    # deal with security releases.!? So we need a current
+    # mk_exim_release.pl. But if we use a current (master), the
+    # reversion script returns wrong version info (it's running inside
+    # the Git tree and uses git --describe, which always returns the
+    # current version of master.) I do not want to change the old
+    # reversion scripts (in 4.86.1, 4.85.1).
+    #
+    # Thus we've to provide the version.sh, based on the info we have
+    # about the release. If reversion finds this, it doesn't try to find
+    # it's own way to get a valid version number from the git.
+    open(my $v, '>', 'version.sh') or die "Can't open '>version.sh' $!\n";
+    print {$v} <<__;
+# initial version automatically generated from $0
+EXIM_RELEASE_VERSION=$context->{major}
+EXIM_VARIANT_VERSION=@{[$context->{minor}?'_'.$context->{minor}:'']}
+EXIM_COMPILE_NUMBER=0
+__
+    close($v);
+    unlink 'version.h';
+    return;
+
+    # Later, if we get the reversion script fixed, we can call it again.
+    # For now (25. Feb. 2016) we'll leave it unused.
+    my @cmd = ("../scripts/reversion", "release", $context->{tag});
     print( "Running: ", join( ' ', @cmd ), "\n" ) if ($verbose);
     system(@cmd) == 0 || croak "reversion failed";
 
     unlink "version.h";
 
-    -f "version.sh" or die "failed to create version.h";
+    -f "version.sh" or die "failed to create version.sh";
 }
 
 # ------------------------------------------------------------------
@@ -288,7 +310,7 @@ sub build_package_directories {
     my $context = shift;
 
     build_main_package_directory($context);
-    build_pspdfinfo_directory($context);
+    build_pspdfinfo_directory($context) if $context->{build_docs};
 }
 
 # ------------------------------------------------------------------
@@ -370,6 +392,7 @@ sub create_tar_files {
                 bzip2   => 1,
                 lzip    => 0,
         },
+        build_docs   => 1,
     };
     my $delete;
     my $cleanup = 1;
@@ -388,6 +411,7 @@ sub create_tar_files {
             'man!'          => \$man,
             'delete!'       => \$delete,
             'cleanup!'      => \$cleanup,
+            'build-docs!'   => \$context->{build_docs},
         )
       )
     {
@@ -404,7 +428,7 @@ sub create_tar_files {
     chdir( $context->{directory} ) || die;
     unpack_tree($context);
     make_version_script($context);
-    build_documentation($context);
+    build_documentation($context) if $context->{build_docs};
     build_package_directories($context);
     create_tar_files($context);
     do_cleanup($context) if ($cleanup);
@@ -423,7 +447,7 @@ mk_exim_release.pl - Build an exim release
 mk_exim_release.pl [options] version
 
  Options:
-   --debug             force debug mode (SQL Trace)
+   --debug             force debug mode
    --verbose           force verbose mode
    --help              display this help and exits
    --man               displays man page
@@ -432,6 +456,7 @@ mk_exim_release.pl [options] version
    --directory=dir     dir to package
    --no-lzip           do not create .tar.lz files
    --delete            Delete packaging directory at start
+   --noweb             skip the website generation
 
 =head1 OPTIONS
 
@@ -439,8 +464,7 @@ mk_exim_release.pl [options] version
 
 =item B<--debug>
 
-Forces debug mode cause all SQL statements generated by L<DBIx::Class>
-to be output.
+Forces debug mode.
 
 =item B<--tar>
 
@@ -478,7 +502,7 @@ Builds an exim release.
 Starting in a populated git repo that has already been tagged for
 release, build docs, build packages etc.
 
-Parameter is the version number to build as - ie 4.72 4.72RC1 etc
+Parameter is the version number to build as - ie 4.72 4.72RC1, 4.86.1, etc
 
 =head1 AUTHOR
 

diff --git a/src/OS/Makefile-Base b/src/OS/Makefile-Base
index 9bc819dd7977e82ca52bfd5da8f548eb09cce3af..e0bdeecfdd41bb85d53c03440a3515fd52ecfab1 100644 (file)
--- a/src/OS/Makefile-Base
+++ b/src/OS/Makefile-Base
@@ -335,6 +335,7 @@ OBJ_EXIM = acl.o base64.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)
@@ -592,6 +593,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 88621403039a5d11443799ad00f9ddb4a77474ba..9420b11c67963a12bb5af6f31947f19d3a4885cc 100755 (executable)
--- a/src/scripts/MakeLinks
+++ b/src/scripts/MakeLinks
@@ -101,7 +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 \
+  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/scripts/reversion b/src/scripts/reversion
index c4618868ec52e4026c6c21422d8968a9752d7696..66c6efbe03e818bcd8a3f37117eed96b5a80e502 100755 (executable)
--- a/src/scripts/reversion
+++ b/src/scripts/reversion
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+set -e
+export LC_ALL=C
+
 # Update Exim's version header file.
 
 # Compatibility gross-ness for non-POSIX systems
@@ -37,8 +40,13 @@ then
        # Modify the output of git describe into separate parts for
        # the name "exim" and the release and variant versions.
        # Put a dot in the version number and remove a spurious g.
-       set $(git describe --dirty=-XX --match 'exim-4*' |
-               sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
+       if [ "$2" ]
+       then
+           description=$(git describe "$2")
+       else
+           description=$(git describe --dirty=-XX --match 'exim-4*')
+       fi
+       set $(echo "$description" | sed 's|-| |;s|_|.|;s|[-_]| _|;s|-g|-|')
        # Only update if we need to
        if [ "$2 $3" != "$EXIM_RELEASE_VERSION $EXIM_VARIANT_VERSION" ]
        then

diff --git a/src/src/environment.c b/src/src/environment.c
new file mode 100644 (file)
index 0000000..8542dc0
--- /dev/null
+++ b/src/src/environment.c
@@ -0,0 +1,71 @@
+/*************************************************
+*     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"
+
+extern char **environ;
+
+/* 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')
+  {
+  /* From: https://github.com/dovecot/core/blob/master/src/lib/env-util.c#L55
+  Try to clear the environment.
+  a) environ = NULL crashes on OS X.
+  b) *environ = NULL doesn't work on FreeBSD 7.0.
+  c) environ = emptyenv doesn't work on Haiku OS
+  d) environ = calloc() should work everywhere */
+
+  if (environ) *environ = NULL;
+
+  }
+else if (Ustrcmp(keep_environment, "*") != 0)
+  {
+  uschar **p;
+  if (environ) for (p = USS environ; *p; /* see below */)
+    {
+    /* It's considered broken if we do not find the '=', according to
+    Florian Weimer. For now we ignore such strings. unsetenv() would complain,
+    getenv() would complain. */
+    uschar *eqp = Ustrchr(*p, '=');
+
+    if (eqp)
+      {
+      uschar *name = string_copyn(*p, eqp - *p);
+      if (OK != match_isinlist(name, CUSS &keep_environment,
+          0, NULL, NULL, MCL_NOEXPAND, FALSE, NULL))
+        if (unsetenv(CS name) < 0) return FALSE;
+        else p = USS environ; /* RESTART from the beginning */
+      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 02f2a9a4db1affa98de47f5f1495f05ec3a11f5a..d6f2d4aac601c3fde28b0167461785bad131543e 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -3743,8 +3743,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
@@ -3907,7 +3918,7 @@ EXIM_TMPDIR by the build scripts.
 #ifdef EXIM_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, EXIM_TMPDIR) != 0)
@@ -3947,10 +3958,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;
@@ -4540,7 +4551,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 97d95dd3d49b697aff07346db801acf357393eda..97af70cee8a83279e720728aad8487a74414ab27 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -108,6 +108,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);
@@ -418,6 +419,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 void *, const void *);
 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 69f217642aa113371caf56aff7b6ee88fed679e5..e5bbb8340bdd2aea41c3dc3af63186d1c4d04080 100644 (file)
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -321,6 +321,7 @@ uschar *acl_wherecodes[]       = { US"550",     /* RCPT */
 BOOL    active_local_from_check = FALSE;
 BOOL    active_local_sender_retain = FALSE;
 BOOL    accept_8bitmime        = TRUE; /* deliberately not RFC compliant */
+uschar *add_environment        = NULL;
 address_item  *addr_duplicate  = NULL;
 
 address_item address_defaults = {
@@ -803,6 +804,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 787de41f0b699efce8b907dbdfbac4944711a67f..1919d8c1fa17272157779e4f19ee50937ea1ebd9 100644 (file)
--- 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 header_line *acl_added_headers; /* Headers added by an ACL */
 extern tree_node *acl_anchor;          /* Tree of named ACLs */
 extern uschar *acl_arg[9];             /* Argument to ACL call */
@@ -516,6 +517,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 9de064d958f877f83b92dd7dd3b0b1e650b3b6f5..ead74c1d039c41a0811b06b111183b16ff6619b5 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -11,11 +11,14 @@ implementation of the conditional .ifdef etc. */
 
 #include "exim.h"
 
+extern char **environ;
+
 static void fn_smtp_receive_timeout(const uschar * name, const uschar * str);
 static void save_config_line(const uschar* line);
 static void save_config_position(const uschar *file, int line);
 static void print_config(BOOL admin);
 
+
 #define CSTATE_STACK_SIZE 10
 
 
@@ -178,6 +181,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 },
@@ -296,6 +300,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 },
@@ -2549,6 +2554,7 @@ second argument is NULL. There are some special values:
   +name              print a named list item
   local_scan         print the local_scan options
   config             print the configuration as it is parsed
+  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
@@ -2697,6 +2703,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), 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),
@@ -3022,6 +3047,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)
@@ -3467,6 +3501,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/setenv.c b/src/src/setenv.c
index 6da56d58d7d7daab3e7e7af4d6d6806cb8c88e5b..eefbec09b36c3a1789ae9b91f35898f66f8b8c89 100644 (file)
--- a/src/src/setenv.c
+++ b/src/src/setenv.c
@@ -34,6 +34,9 @@ if (!name)
   return -1;
   }
 
+if (!environ)
+  return 0;
+
 for (end = name; *end != '=' && *end; ) end++;
 len = end - name;
   

diff --git a/src/src/string.c b/src/src/string.c
index c0dfd04b6de31852b986e5e024b9d57f8b28827b..e0e0fa5ae536db9a0294e8373ecf77c643e69f81 100644 (file)
--- a/src/src/string.c
+++ b/src/src/string.c
@@ -1707,6 +1707,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 void *a, const void *b)
+{
+return Ustrcmp(* CUSS a, * CUSS b);
+}
+#endif /* COMPILE_UTILITY */
 
 
 

diff --git a/src/src/tls-openssl.c b/src/src/tls-openssl.c
index 4f02d078f1a5f1a99a487bf5a7fd2d53589468c9..83594c9731db8e7da88916a2d4232f1018ac09fb 100644 (file)
--- a/src/src/tls-openssl.c
+++ b/src/src/tls-openssl.c
@@ -897,7 +897,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 a0c5072d6f51e5d7fe0a83340e990a7337d42af3..12c91fda1d32423f76c921936118e9dc591fdcd9 100644 (file)
--- a/test/confs/0000
+++ b/test/confs/0000
@@ -3,11 +3,11 @@
 # 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
 tls_advertise_hosts =
+keep_environment =
 
 # End

diff --git a/test/confs/0001 b/test/confs/0001
index 5350ba463f4cdfd260f9b97b164cc4cb1f64af00..0daf053bdd04824618722e4c87cc78c0cc3f27b1 100644 (file)
--- 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 0616f5ecfbb69e194af61876965a6bd68f05a770..6ca2d1bcbb8ff3639c5013052fbe8a594b4d199e 100644 (file)
--- 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 0c95732cc639395c870845c8a8b0ce86a26bb806..ccf723761930ada922ee5ec0fa900066d5948e61 100644 (file)
--- 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 8faf1c60a38ef8a0c0d90c64901403099d95d2e9..12cd8dba952effa8808f14ef031c31654f98987c 100644 (file)
--- 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 de20203a3c178b6b5a24fe7e2d41ef0a666ed163..b503b81a512b4e05410d4ccee118bd98e9c71281 100644 (file)
--- 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 597c6bafb282bc5f141abf9abed7116056dad125..4cd84a275286e062cd3bc04dc2d46b5c59e77bbc 100644 (file)
--- 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 e31fd4c5c5d2f2180088f36a39e02ba0980a654b..910c5a7f0ff35a690feec70ad2965f716e76daac 100644 (file)
--- 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 1a3ce395fa6bb3f74b70c4bb5d035a4195309f6a..de228d31e1a17ecd6975436bc2910bf3617a5183 100644 (file)
--- 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 ce366fd38874949c71059705c03822b10d315d6b..34dee6e0af71e5727753348dacdc82669a19733b 100644 (file)
--- 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 074928a87e2d7d4794bf622a0ce3d3ee29bd7d3c..9bf862dd445d2545a059f297b3c91dd4b6d0e03a 100644 (file)
--- 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 53864399f5831de1d54d88ac57ddab1fa277c5a0..f1aa77a5e65c5c421e924c03e0bc8ba844923ff6 100644 (file)
--- 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 7b07d27fc33907424e0c81ae50c5a473444a0c30..7df08cb097c04ea69884375df41dfae00da42b16 100644 (file)
--- 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 bc266e5fd6243182f90c0079d042c92e2df6e4a6..61f0d579d7fc638e125fe7e4c8d05d16aefa8f8f 100644 (file)
--- 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 da0abb449e47d4567c968b2e5c220d2781c6c452..7f15c410855f1891b0bff7d2e5ac6baf8efcbbbf 100644 (file)
--- 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 04dc46cf2fcc0b0b2e1c78635478734930ec6207..593c29555462c71a51ede82a1094ba9ce84d0d6b 100644 (file)
--- 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 d68778639d8e33e73c8555050b2fc13238aae617..7001b97749d3bb2dfb9369798ae2220cf06dee1e 100644 (file)
--- 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 c1b94ccd0fa1033d0e9e0703601303c59659666f..6e36a38ea3a0f2b87623c092735d29391c251cb7 100644 (file)
--- 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 1eb1b08f7d2b88eec03198f31227dd4ffba1366a..6fbfb4342263a0a85658974df476b4f3eefff878 100644 (file)
--- 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 2ca5d58938b2eaba7350a87803c01028bdeb5bab..5757c1cf6870900b23b395b9e36832f8f8e1cd38 100644 (file)
--- 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 1182e6a84ad949a7a1504bb6397393e1a8e8aade..6672ccf2f6a5f7440a19ee60ddd9b95b699b533b 100644 (file)
--- 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 31cf2c6701c924942d936c0957a1c91670f0e0af..c48c0e08e9680f641488e4e98066f343f3568f2d 100644 (file)
--- 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 e2ebe66f90123d8768902e1c964f367dcdc1f455..7a2742790dc4f4ddc0c6c837cd4235bf030e77f8 100644 (file)
--- 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 0883bffa492a24eafc01bb23214cb32c08dee894..b59a52f92d7c37b39b509a0ddb44a9c4dac8f352 100644 (file)
--- 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 0d55784237d50100a2e459da35af520076e1ea3b..ee60a322e8d886393dbea2991caa40ebd6b44be0 100644 (file)
--- 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 a655d5f881fd36f014807f0d9cd58661e13f1e22..6477950becb6ca6e30f05e76f94749fd6cadaf71 100644 (file)
--- 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 f4058798031cc6253d765a40c85f77bf056f501d..2b1763f87c8434073127c790f0bca622847a8900 100644 (file)
--- 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 b508a5b65b1bd35e25c6e33a7faffe96c2bcc033..f671831b0d0d793c8f3249d94bbf26e72a36ce61 100644 (file)
--- 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 cc0784b0624c8fac32825d7b08f214418dcaa76c..6308f8358693962733925454af6715df6d1251ea 100644 (file)
--- 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 a4eb1b1db3f468140451dbac06b9b68b50c521bd..d65cf1181a9d166c31dde670d11f74b3b4576493 100644 (file)
--- 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 c7c5f0867f1897fdda293472dfcd494dac2ce6c0..89ced1f25bcd4e73cf21e8c92c47fd9e6057434a 100644 (file)
--- 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 0328320ca4b2016b0097f3043f42309959263924..2716b59cb1430ead5b8ea5183aee0e126d4431ef 100644 (file)
--- 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 1648fd2170207ee4eb8752030876829fc3839911..8368f155a0cad422471693ecdc656188dea62f40 100644 (file)
--- 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 9e95388c3b0fa384e279eb1f4290d5d2593c3ad2..825126bb7d51272e48a8667c933e3dad5a568329 100644 (file)
--- 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 e5f7931c3617ca34130e165e75f7a332fb936e04..8dbe9ea1d8884c159179dd9088179faacbd06561 100644 (file)
--- 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 36ad12a8319050c4445c67e5a182e965993f927b..a8cd5c66a15754459f10182a145533e2c771fcaf 100644 (file)
--- 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 0c504444584d7682f756d6febe0954e8072fdc7d..7d54acbee203385ee5dd2e788ba8faabc2665ce3 100644 (file)
--- 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 98ef4d3d4b6f667c98bf7e029a7743f2e4e014ce..56323db4bb5204eda7f688832f93c6a3c6932384 100644 (file)
--- 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 514af9e8aff1a1e63bd233a91fae7d06b0d6bc39..b95b140b51c2499b8086ef0bb2ca5e1c0cf18af0 100644 (file)
--- 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 f8ad999f57c83dd692a1bc65fdbe92dab8a88d80..5ca25b2e4a509e9607c489b71161e18740b9d9f8 100644 (file)
--- 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 71f903845facaa48d2923ddf38ca1434c5006e6b..88b63f1f79cc339ae772a0b237e841fdcc8af73f 100644 (file)
--- 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 ec1067584443df435271984a437ec69ef8029bd5..e0b820fb2741eef445d2b2c44d239377f0209779 100644 (file)
--- 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 c65be6f990c882b4957c35e7353ed4f889016a49..a4a81bfbe9ac2df68c300f05b07266d034368ef5 100644 (file)
--- 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 eaa13a8593432146ec83d3495959d415e0812237..4db392cd13743d64d940d37dc00958ca3a428ba4 100644 (file)
--- 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 963a55ea30d5304a67b7f9055911f7813338d219..9e3f020c9d13318f0884e3f20bb1f5869976d109 100644 (file)
--- 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 764a7f2136c60d1ef0d966e3a10537e4f43c5c45..f8caf1419fd3f1a9a034fe14c538af1e1c60184a 100644 (file)
--- 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 a64d3d9eab3e62ae50ac5c6df1a8aa26d8021c0d..4e7ff862a4a97a044234d785ffebf4e1ea88d748 100644 (file)
--- 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 ff8aea17349952bd86287b6ed9dc0fa319dddbbf..5e7d27d9707fb3017746a1ab03fb5e1f2ddb418d 100644 (file)
--- 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 c15945f98a7c4580cb1b6ba4a4c6f8d91a9d289e..86560d587cf97a1bca9d66e69357025bb6540e19 100644 (file)
--- 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 4dc39d87b7ab9d6c35b2d5c180c0ff77bf3359ef..0de91eeed23bdb41ab8395d3bd9bb24b66b7c508 100644 (file)
--- 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 47869246c13b237795b8fbff563a846f9e8fdb11..f709ad674831d67bf5b4dc340940f90c4965dd73 100644 (file)
--- 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 af1e10acdf17c463aa95bded987a297d4e377237..34016ab81f3b557bcb90deb86103b47b93d63028 100644 (file)
--- 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 3b36daf044e2df77e642b344879994cab83d6b23..2e2c13133c49cbab9286c7b32bfc7b63b74bbb3b 100644 (file)
--- 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 0e6a98546a75ffb88205871daa05f35e5823c317..16702ffeb7aabce5ba3d8b2e630b4ea2e919d03f 100644 (file)
--- 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 13ca588a459bcecfa36914c438726ece568c3f21..ee63ec24bb4aea6bcdd37e8a410f9a071cda63c7 100644 (file)
--- 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 0c64561b3d910d29021444987fc1250da0c69a82..ce1b22514daf74b9e2b0df07d9807a38db1e9882 100644 (file)
--- 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 cc151dd70ceb395a08234b0f8a74e56cae12cf06..299448369e780de3e07c0b1dabe703df2a664bf0 100644 (file)
--- 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 2b13c187d26cc73d2c6c7fce2705d4f63c5617db..f2bc88f8a2acbae47050eb1ad47137ed0da73922 100644 (file)
--- 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 4c34723798f960cef7910a79ac64265fc4b60d21..2b15f6290a27fb68f4992dae5ecd467efec9520a 100644 (file)
--- 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 6c771f1d27efb6dfda2afcc1daec1f817cca606b..f591bf6b350bede8e0fad9fde8757174ebe55809 100644 (file)
--- 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 c17f0037277aff3cc289119bd4d88d60adb17544..8ce8d1012d474ff0829fce7c7665a2eb5187c996 100644 (file)
--- 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 5f8521499bf5aef40bf033a9249c84ddf1b4d71e..70d21834e257a237d740a708dec51a958669c73b 100644 (file)
--- 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 3e3ee757d3bdfdfb0f3c05853b71e4ccba489da8..7e64746554d44e43512b0120c0aa5699d137408c 100644 (file)
--- 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 e832aa81a2d32a7ad1eaa3b0c130f2fb995b5d92..be66b1a3fcdbcef9bd0530d91a2838e67d97e97d 100644 (file)
--- 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 5046f23754160b9d554d53c5b73bc9407384ab37..4feaed25d0c81da54a75f4ff433db83c36a4ef69 100644 (file)
--- 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 47b90b1990049dbb009cc2b1ec1029b7ef1f2a92..7d08f964090073e3d3b54dffd0ca59bef54d67a4 100644 (file)
--- 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 6271d5a0de690792900acdae74c3118aaf52474b..959b878e3e7ae45f44241f94407e1245aa67a213 100644 (file)
--- 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 de9a0db9c030a4c810c0cd60acb037164a1f922b..ac2af9c198283a22636efe71a290ff309798cd27 100644 (file)
--- 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 f4239beeae66a05c5affa75ebc70bd4c79dc48f6..2de360fbdee56d567dac4eaaf2f3f4fc5818961b 100644 (file)
--- 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 3514a1ea1d1489e929d1fee0b9306f7defbcdef7..23685e40ec0b25ca592453050c01b0634fc589c4 100644 (file)
--- 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 1c439b72b44a73ade48fa670b98bbb8435342662..4ffe3668ca63ffd5c992e3235e7603edfa4122ec 100644 (file)
--- 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 00d45578a3b75b238f0ec56e4287e026d9824f21..e18ab0bbfb04c37c19c80df75642c60c7fe9cf67 100644 (file)
--- 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 69ad904cd94cc2767a70652e89f7bd220ce56027..94c4dcbe5cc71557b58b992f219d4b2d12b75ad9 100644 (file)
--- 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 dfea2c293f12348b23db25f64ea187814b457865..f6c18247dedc321b4f47a37ea7a7b7b98ff61971 100644 (file)
--- 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 c967ba27c7ee35cbe2f9c3a8ca350a36b6625dc3..ab300745540cdd183bee66b15a5ea61540c5cf89 100644 (file)
--- 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 e4a6fdfca86ef3dfb64edd18ac2d6d15b6ef7818..cb9d472ff4fba1d38c30a11385dc28bbe686485b 100644 (file)
--- 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 840fde7e3c314ff0c9b9d67fea203f52d2cde03f..bd3863cf784f72f7a498681277e87356419d8170 100644 (file)
--- 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 18edff9252e581bf85e54c027b889f87cfffbc73..b2138536e06bee37ca042ae83b0bd3330b9316d0 100644 (file)
--- 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 7955d10c578fa4244a0a8481aafc480e0d04b0ae..1be361abdd3b35f5aeb4b4530b2cb54a9bce5b6b 100644 (file)
--- 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 3279e52e8dd67fe28bf086e599f9d0743cd10600..f9be0824403f55a95bb0aa84cf8ba0203e7150cd 100644 (file)
--- 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 fc5f82449254980e3da966d123844f84f6cc154a..4bc2e3a3b5b227cf0dd131936259f694bdfe792d 100644 (file)
--- 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 29a35862b23148ee756a11ff3b47ad74253398b8..4e2f4949e14469a04d08494acd0b6f7a4c262e9f 100644 (file)
--- 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 7219daf2deb58fe40457c853b43dc35d5720aa95..b4bfc76934dc400ef1f2ea2eafdc8f43d377f81b 100644 (file)
--- 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 e7b1a0486d0b92de26cc4073112b9595767bc8a1..37c7bac2e4153587fd4dfbc32c872ae9abf4aa9c 100644 (file)
--- 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 44e57633d9c584663affb489764ebff3454bac04..b4530996f59bdc59fbd7a79bd8e9d2fff37440a2 100644 (file)
--- 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 efd52533c25a2ffabd9c4bd282a1b3146456fe68..0a74e159131aa6835903ad698da716b9dc8574c2 100644 (file)
--- 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 f512e31942c803bfafece9dd94dfa4d4159b162e..256cc6047ff2d481eaeaf6db0100cad156d360a6 100644 (file)
--- 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 2e8200a3d40b90817874a551807dd19d0cf8efce..f59143e3f473ee9a6b08ec030d2c941ef301f264 100644 (file)
--- 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 13f0ffc62f6866a00642a589c30671f70307cd5f..0c1d5884ebef7c612bc7c28ef0022f02d75c8e82 100644 (file)
--- 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 4b6bc6500aaf94e56c5c9acaa0b1860b3ffd552e..ccb0283e21eb945605f395af1873b314817b680a 100644 (file)
--- 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 735ea021abb62e91f58d3b0483b924dbb077b610..3612e8aa88e9da9f595d120b1285ce9c1a00c872 100644 (file)
--- 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 58bd6df710f031910f185b1d4597ec3110337bd4..3dcc12b0a9b86624df27560872a16d842e8029e5 100644 (file)
--- 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 e0c221bbf84cd34060e6b0cbf19a3654478f0288..8497dc0442db6fde82a367711c7ab6bda03aa63d 100644 (file)
--- 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 e944815186551c402aeb7fe2c12f85a82ff07b28..0cdc58b38b2c183225e6f0fa4f6f126a53bb9f5d 100644 (file)
--- 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 79825c75869a9ec06a28d2ce5064c15b0a635f07..b586dc4341a1144349b784cce55426661dd99a4f 100644 (file)
--- 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 ba3e7b8055615e5d94bec1499ea5d68e02f024ae..fb79c9d289206413f1def7ca4744da50de0878a2 100644 (file)
--- 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 074dc2fd49eae2db3c327003e69be4e5f54b68e6..5ef2ec20e202adf62b2af243978a52e5edc4722c 100644 (file)
--- 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 3c711253a918a75dcd184264142163cce58beffa..2ad1b5e1fb3d8dbcad0fe2492c4a6586fe1ad57d 100644 (file)
--- 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 03f94ac377a1bfd6681b6fb7665e337765ee4cb0..60402deaf362a4a8c18d5f233bcc553dd383bef4 100644 (file)
--- 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 0b4c1372b4d17dff0ae39e39b2e2c672fa3b7996..122856ce7a9d6de1e2a5e62da3f234fe0caaa16a 100644 (file)
--- 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 d9843d074567cb78c94bffaab96f4f234d4de22b..55cd947b5a3167d4b1d16911798a2128b891bf26 100644 (file)
--- 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 3b421a755eb174b7ff69be73d3678cb0aaa40301..05832fb45122cafbde2eef9c4068b54e902f63b3 100644 (file)
--- 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 e9e7512df58f92157a0f9539f7673e13d5e71855..ac33f72f443135d12956687179dda24dffbdcf47 100644 (file)
--- 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 63311a21a45c676987463c318af59f400381aba8..9d40134e7b4412447c856473637d608892243062 100644 (file)
--- 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 18ce0b046146ffe5ecdbfac6c0f66d84ea52764b..6101f0c1cd1ca89a19ff21e8a4dc3eb533006394 100644 (file)
--- 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 3cc1a80e90e71950ee47cd57f4c175c9633f25f2..a6763313fdebd490e6fe0c6f07862028ece16061 100644 (file)
--- 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 faaccd0c85f4b1292a66e76b8032c688658eb707..52130ede0a000f189f42878884cc4bf96e83dfb1 100644 (file)
--- 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 72bc6c5c21f814214b4ed45f269bb394ec505f89..06e7b83ae734ce26c517d100c74e4db962116995 100644 (file)
--- 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 f8e5d0b123b0a8e2987c7a38698d89de82137110..37c53de6e8a765f0cb961391deb84ee18d1c208f 100644 (file)
--- 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 ebc53295dbd205c5e15455e4cd93766755c2b8ef..38401bdb9b66c9d683c230bfb14536ea67c7ed01 100644 (file)
--- 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 63377228c44bccfa4951cc970e72128b6562aaf2..d8fb4a9e7aab81e1962bbdf5d0a5a7fb93fa0488 100644 (file)
--- 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 9a840e95664292e9083b3b984d577c23a7b11591..377a9a0626bbb703d4daf4e385d2a251008e84ff 100644 (file)
--- 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 312baae732211a1cde726a7029275456c609f6a2..bb133227f883d46898d340d3492bdd8147c1e92a 100644 (file)
--- 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 a5bc653fc5c7688c088d4267f748fac3d3c679d3..a24c029b588473e6856c6e16fc198302b6a04d77 100644 (file)
--- 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 10cf42a8219ab41d6e18c9db7e8ce5c26e6a4e3e..acaf05c03e6a1337b8afe8de226cee06064744e7 100644 (file)
--- 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 aaf04e5016515b4464d9c7cc1dceb6758e289c9a..ad4d469a168e181227544a204f4fc87d3d7eafb6 100644 (file)
--- 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 e657b11c2f544b9d3937f2576a8dafbbe8757e57..da70ac0e51fb26b50c429b78cc43fe3c7b54a3f8 100644 (file)
--- 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 f80fc9ae556f28123d407d972a66088465ef5a95..f0bcd89f30b9f837d54b92d636a3a19eaa81109f 100644 (file)
--- 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 45b9f79e424c2cb7879a28a0a804c5591a966105..0223df01f69fead49a4a64fa09dd28ea357ccbc2 100644 (file)
--- 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 f33253242129c05333ae9eebcd284ec9102ca9b9..74cd7ae2c5b0f48688061b23d1ee5203cc0874ef 100644 (file)
--- 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 6ede1ee4e73a934d3254090706c14151244744e4..ddba4d32de2054da6195c01173f942b0c43c6af4 100644 (file)
--- 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 6c6f65d3adc9e1b6672154e397da344baff2d85a..3d5e8472149eac76cbe12851e5a3dec7841e8019 100644 (file)
--- 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 8ed176fe34d4d7f42f10913f678f16c0fdbeced3..bec8032f7d79f3302b4b7314961f0edd12c9280b 100644 (file)
--- 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 fc8ded626b3407162aca7f37ab7980ab118a5c9c..250ac1d168d8b8408a4f48770e45c43fb91f9cee 100644 (file)
--- 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 8dff37eebb3c1c76ecf4af3cbca916b25af9fc40..5cc80384170dbbed040e390deb4a57996adca93c 100644 (file)
--- 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 23547965f14c7343a80eb341aed991df17b22413..9bc55c728ea820a81b2b0aad955dae03ac6556d6 100644 (file)
--- 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 5b4bb9c3b57407f61e02f0e38a3577b50434afe2..8a8474aa3a679718d96ec3ba5f791e7b5117cb7c 100644 (file)
--- 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 f3dbe76e602a90116957aaecdef8fd602a159faf..33c72e35208766b3518a37a2b6e0dd3aa2f2c046 100644 (file)
--- 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 f81392e9cfa7e02cd80d3ad2e810315c932e8be2..d0e8cc4c42c2a1ea249fbc13367b024117dbb52c 100644 (file)
--- 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 0fe74070b589c1fdeb14f408ddfdebd03551d20f..378a6b9042d06bbf523a22428c25e71d6e82921d 100644 (file)
--- 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 c6dfcc4206a271e88c2787c2007a67e2cb039d5e..5871fc75f5eb1b488a7d67f0dee2ef520cac9153 100644 (file)
--- 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 85aa1250d0278f0af0f7af61aa673e8205315a04..4ca5af5f4cfc0037daf6b20f7c01566a4bdcacfe 100644 (file)
--- 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 b018f2d6c675932a94b923e1a8d34b6f93d06315..50bce7969c7f94f580577c0f901d3518a86d969f 100644 (file)
--- 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 c85cc8dc345a7059942fde9f011b9eeab77d3285..7150db724c446affac2e4cc80755f935a992cc47 100644 (file)
--- 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 8217278c4da2025b68ec525e7b212441947a97ad..c8f8227b01ba807a664965dfc93398faf7247c30 100644 (file)
--- 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 549579f5b7ff8fd53be572f0c53c5f18403982c4..913373d8aaaac64869573e6d271c9fed3cf05755 100644 (file)
--- 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 b35b4e078dad21e3ecaec47b2d24be9b02f64c90..c6bd5f557ccec7555c930da5a1a677750cc23fb1 100644 (file)
--- 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 82714a382e2d7fb25bc09cbdb50edb32d89bd4a5..b40c83c155803e09d0ad5b909be1c13f4cd0c428 100644 (file)
--- 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 a59fc8d465191c8bc87551288fb5267ddc65e8d2..9de30ce7dfd63c673fd9332beb1afbb9b82cd993 100644 (file)
--- 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 a5a315e0aa75f041894a56f104f5d091d0ee0824..b1a243e425fe7aab74dc117ff254ef97eff239f6 100644 (file)
--- 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 d44f11a04850ff807d9097cb6da87eab3b6c3b31..8ab406add3d940d9be9207c7ce84023e29a9bd48 100644 (file)
--- 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 a9d2d2f6896500e8060b730051aa6d91cb8b2d41..ddb05cd663f6bccdaf681a8085ab2d02859f6a55 100644 (file)
--- 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 86d91110172b070a033d7400099797423709bde5..2e25d4438fcdc077a6cc065a2e58e2a8d39da33b 100644 (file)
--- 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 fd3bb295dfa2b10432c29196791bd7dec861558c..a6dfbb61f8ae0361a0db694d21db5ee963ae690c 100644 (file)
--- 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 d337a8e1e7ddf2d873ebf20b0849d8d59529401d..3c5c4d03578dedf7d43f1015bc1468393a494122 100644 (file)
--- 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 ab8cc6691c5d0bcc3caa6556cc37f0fb354d3aab..f4f96590d835ff056569cd41027ec645334ab960 100644 (file)
--- 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 f2f0e26a3492ac11826508fedaa00f1ff6de0ff6..a0f8a4c404ae4f6a9027e10a0cb3471066802e9d 100644 (file)
--- 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 643e86d446628e0039647f9fbf5853dab4db3329..bf78500f4fe874d656ba2da929af1987e54d6370 100644 (file)
--- 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 6a87274d4c002b7de6cb19d7b2f35dfbd560638a..a01bbf26aa9fcc133d9986b8889091e2037d7991 100644 (file)
--- 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 33c022f22750d70be4f8f274377c9152153e78b3..30c35b40054f03a6d0c3b033d909e3530904b912 100644 (file)
--- 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 fa4bac12e2ea9a42fc222e032f237c08859d0eab..818f1a28b1d35cf86a5e5ed0886b1a93e3428173 100644 (file)
--- 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 58aa30eed8d57e7969ac4d5516e69f132fb389b9..5c8565e2ef14b94dba33c69fadc9ad2df1fac5a0 100644 (file)
--- 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 2804f66163386eed74fcc04960ed328bf8143146..f8ca251044f85422344f452a3979a0cf460b04fa 100644 (file)
--- 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 c7fc79d54174c0db13c26b92f8f5fbf12e0f0097..171d6f5ac47001e229c2967802a5a4f029ed8be5 100644 (file)
--- 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 84ed47d7d947b607a48f626f4f938be2aa3f36b6..3e9006eaa4d23b3fac10f83b9649c16643086c68 100644 (file)
--- 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 b51837c4d93c5628f63b130a21a641a17e6039b5..3fe4bb3c6ec0f074c36841b2891242c914f2c8b4 100644 (file)
--- 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 389811416299ea6c4a893832e2edad1919deb124..e718552d602e5b4d1239035c19095464a01183b0 100644 (file)
--- 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 69556016e35ae428262c33349b726d3e335050d8..674ed171e873b7b8b7fe520ac9b4475e386078a0 100644 (file)
--- 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 5af7471382221ee4c6e359090d1fdc8ab2679b98..e9001bc278e9fbf2bb79f2ea42f059d15303e796 100644 (file)
--- 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 59d3087c91c08e077f138dea6cdff341d27049e7..d5eb44a7baa88d55f3a5c15d34c56f648df8d24b 100644 (file)
--- 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 68a5fe77a682fa7afb5a760a81678c3e9ace301a..f1ab669d0f9c5d2e6aaa87c169666b2df683a5f3 100644 (file)
--- 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 46175d9a03b373631eb81c1ac50a039fa5f769a4..3a5626ad9eaacead6a10938179521996f77be1ae 100644 (file)
--- 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 b8bc6ae55be6101260b4263dcd2b378b595593a2..d62d8a1c9e17fb37ad20789f7466d5688b635016 100644 (file)
--- 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 4b217eef6e23c8452b75f761227c19bba144ab28..923968659bd723166177bc31043601033fec9259 100644 (file)
--- 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 1d28066b48d547e5367e542f603617e317b43ced..c81cc617e2c5cdaa06f1cb6aa01075a6b01709e1 100644 (file)
--- 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 03be27c404628bf1cbde58859249ed036948c7f5..dd9ec9ff148946316cd9577cc5fcde931c1637d9 100644 (file)
--- 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 6d492d7fd224d1fd46a46ebf59cf3f52fe28fdf9..85a75fe9ed2a1fffafbf547e30719219fc5e970a 100644 (file)
--- 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 6339934242eb0b6c7b80341ce3ce05113a7ec6db..06b857efc35b7d1d0e5be3a39b7269203f2f928e 100644 (file)
--- 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 ea10f1244ee1039503aa415cc8d523d95dd1c92b..a16aa98138b4deca731e0b408c35e8de04fec253 100644 (file)
--- 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 4a42f0de274543baabbe58f25e88025e6599aac4..db212a2e5dfecfa68f8b538d3ceea0ff5e2d4a4f 100644 (file)
--- 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 735b7b262b91c7dec07c736b702da3d053edfacf..227acdbf2645869a7c175fecb9dc9ce8c5cdff00 100644 (file)
--- 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 2c2d18e414ee7dc8480fb0f91c28e7b186b47249..37f4b5c917cf4c7e16c00a0d6d871f1d3d6569b1 100644 (file)
--- 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 82d1feac8006e90fdbcef1ae744df5b4be71fd44..96567f25e2c40f0d8034bce82ebcd0525ae8e4f1 100644 (file)
--- 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 6f8ded7cb0a6c504c5fc9b80d044f90885758a4d..7fd9179dd2839bbb79d8ebafed851bbc1c67cf4a 100644 (file)
--- 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 a3e11143e8c380750ec07fa595df6438235809d4..ece486e34a53c85813df682c52eb267c6d326409 100644 (file)
--- 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 2898683e54c76e21c5480e4f1da85fab7a4c7edb..838a0736dfd4700913a6f46be1bd9013b594dbf0 100644 (file)
--- 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 cf5d41f15b5fd143b500b3d3bef4c1eda3fe8712..2b76446f46f305ab05fee139a763f3c198af72e4 100644 (file)
--- 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 ccf9611f9ebf373770554dc71d015b1743b65f3b..3bc3ab0248037b166b6b7f88655b3edeaabc9e6c 100644 (file)
--- 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 aaa83f0eb62570da1ff56c3531f8a5836fd15c68..e931379304b502a52261e1fa1a49148422a2244b 100644 (file)
--- 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 d3a6da6fddf6a91d35c8c30ae8f0e54ee9f12a1f..14539bec4369f7e99edc500ac9245df6e86a1adb 100644 (file)
--- 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 663780b902a36c1b38b2fc1e569ca4fbc91a91c6..29014f7e9717f0236464257f28d3addcfa2c3c6d 100644 (file)
--- 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 ab3bfdb2f130fab40733b388effc8b4cc1785ad1..5e1624a3285bce63bd26be72864c62f3f6d85ec4 100644 (file)
--- 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 f76ae7f678f89d5903a85db87b010d31bc9a3842..ed75a6ca87da865b55d99b9d14ba6a72bfe279a1 100644 (file)
--- 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 65643d4771a75228eae130890660a0c803418263..6ca0ed027c35239e2f1e9c8abdb8ac036127e89d 100644 (file)
--- 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 9e43a38fddb2010a714df96f4df51a8b8318c22d..95aaa14f2d47be2719bab328bf7f6c7521deca0f 100644 (file)
--- 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 d88d1e2f9927a479d2e9b10bcc82c80dcdb6f86e..b17f72a977904afd2a3ba401d6f8112e310b24fb 100644 (file)
--- 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 5aa2c70d51ac10a9712b90f5c3e30aeae7355a64..8e88ab1094e0cea7967070e2f20bd9240d0c1297 100644 (file)
--- 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 af570f0e0802322031b8e33856f39d43be30594c..6731b6230712a0da20fa5c3121532bcd125f0eaa 100644 (file)
--- 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 70eabdd51dd3d5fa835fb640061c16ff0875071d..2385462ef2d11cb2ab59730dce6ad6cd4cdde518 100644 (file)
--- 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 bc29d4961157ce6f3b454450657ce67b640959da..28831d622059334a6828c913b6fba0d4b6c147c4 100644 (file)
--- 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 e76cdbbd1a5caa61e89cb899dc32c726ddb5ffe9..fb4fdc90c0bcf0231e366f01faba6e67196a9149 100644 (file)
--- 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 4585e390a728ee86945713b78e5a432618e07c0c..04597e5aec69e204aae55a4154aabb350106e14e 100644 (file)
--- 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 42fb603ca2a1a93506ecd3195a7c1c5d410a8944..da0a6ffa71c3ecb2e812354847a96ed0aeed6e3a 100644 (file)
--- 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 1cba850e7f628ddcf9703751876f52a9d84b9637..dbc7ef62feb14c7c8d912e5f5c066c55c26f49af 100644 (file)
--- 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 e2c4160ead0ca1341fd13a2276dd6a4d2a846154..548a9154532d7e39947bdc771521cd7cc5e5d1fc 100644 (file)
--- 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 75c19ca62e1fd6f1559089e352c9942f4928c621..4b479e6011106c9a08f10b9a77b3bd7f1fc04a94 100644 (file)
--- 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 096aa30ab843dd00412195f240b5dab3f8806942..73a71142f5bd1ad43207e62b2a0ef40e090de56a 100644 (file)
--- 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 32760b5a17a6946a745b2813641f73b16d5a2a3b..0ed172695f0662669c273fbdb1c6444d6e8008cc 100644 (file)
--- 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 3946f8441a2ef692bdf73a9d630d73f937acbe81..4cdb86a2e6c65fdb17b0dd9ddbc8e0d8fcab2717 100644 (file)
--- 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 e7e17716f21ae9f827c41ae2be0a6df7e50bffa5..17437ef63b29467a5da5a456ee459c209d3bfe99 100644 (file)
--- 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 0660b9a2e9a06ed4e2859aef0d3f52d2faa1ae1f..1c6e9f675d1c22339b5812e91e36336421306c2a 100644 (file)
--- 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 0c1a0510a98fc983538eb12caca08ac9e93d392b..1575bcd9c12de51a6a8eec0a02451f14e563de7b 100644 (file)
--- 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 56f601416c4be9cae8239509aaf4ff2adf48d6e9..f7a51edd43574d8ae07f7312f7bc7f1f5f1461bf 100644 (file)
--- 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 3e7f49652783c79098bd5e15a266623f8c37196e..2dc3d279087efd586dc3cd02fbd4b46fc556307a 100644 (file)
--- 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 fa0400a91b003422c88d6b30bf067916b78e7112..e5792de54bc985948e84ca302c6b71edec3c7759 100644 (file)
--- 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 4dc1be78af98cd15e9af87bdc974d8c4a5649b34..60c943e2c6cea89e2e177e4b49c77cac71c1f6d9 100644 (file)
--- 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 80fc0d85174528dbed31c1d9be666e04c71e05d1..f6fc540e2b716c94ded8d941a95572879d351d2b 100644 (file)
--- 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 1bc90fe41c87e3de5443a11949538fc09669915a..9a7d5bfa944a289e8ddff305c965992c7a757229 100644 (file)
--- 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 8a1a87dfe6791a139ed049f7427407476f062467..8d74eabfc3d453b82fa2b0177e419aea50cec849 100644 (file)
--- 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 28a3d6d77a3593e662585b102e7bb8d458a7aca4..e24138956b682b892461a29af423779997a6b8f1 100644 (file)
--- 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 28e29cd6df21493c1a28db19e23ef06f307f628b..33306388f3331bef0236a3264a51a493835c9a5b 100644 (file)
--- 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 6a532b6a03721018914c21f3030bc0c394e38df8..5a86785dda7170a56d3142b54b76ac131270d821 100644 (file)
--- 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 a4c623bd891fa0f852a959a67ef0318c40f7c797..feea115339cd6291a246ab8a08b222b301727e3c 100644 (file)
--- 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 e281363522d4fe2559414d246a57485a4928381c..71c716faf0fa4758f253971756034f80f7f55420 100644 (file)
--- 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 e06affae857639ca1e6ce8ffeb99aa261a2197a0..6ba026d02aea49f298e89d4525838ba41dff399f 100644 (file)
--- 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 30277dac8ef85da99b68e7bf724231afdc7d7eaa..075b2b54c117498829db65a21e0cb160e854f344 100644 (file)
--- 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 777737c07ec1c87263fea2f753dd111d5b089ba7..253e001e1cef32e244b82909faf58ad1a504fb81 100644 (file)
--- 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 a446c2896133ea239419069a071ed734b4c1cd40..44dce1345ba54b41e1aad3e8a67c925e84bd6ebf 100644 (file)
--- 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 4a96d825e44b037ac19844a7eaf90419da492902..fae18f0e13b7f7e14efb9945ea0bc74e97e563db 100644 (file)
--- 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 9ae32da17fc986009a13e5ec3a73146b1e60239d..9a44a46b003a6f7a7ec7cd30367745142814e053 100644 (file)
--- 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 ef71838acc6bc8f92a9c0e79751f52a5040970d5..0c21b5af61c2e6b12bf118cc1d33d052bc9eceaa 100644 (file)
--- 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 8cf29a197be994253a42c1ff87cdbfafb576cbf8..f9584d18edec88f7d92697bfd4994c095e26b671 100644 (file)
--- 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 f2ed82213ee20c3f24dcfc34a09169b8e79c19c0..00eddf642fff7b4a88e6fe10d4818070287e0dd1 100644 (file)
--- 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 640b98cd1f0c696c0f8eb01e270847a0cbcf2658..7747a8716452a967df944a7f97a0aff672aac459 100644 (file)
--- 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 10b429e49f8e2da0b106a7e16d8c7b16e37bd655..377bd5a2374d76851b3af9439531b50da66a5666 100644 (file)
--- 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 5a2cacef7a22bc124c4f8399a491f90905f88f8c..9d4e4abf2e5b732293bcfcc74c49045085df154b 100644 (file)
--- 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 b7117f257c74bb831416709f8ac08cd11d5debd0..5d56c6e9d0f62375308a3c14ed1689457f4ba196 100644 (file)
--- 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 8aaf7a881156401a6d91f9298e05e1ca57e50ddf..7100f6a15f128db3772f2a0f0c018758b425f851 100644 (file)
--- 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 4253c38e0393934ed3805aa3fafd855fd9eb89c7..3bbd157f26ba1c005cebee9a64ba7ba59f7342e1 100644 (file)
--- 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 0a299bfdaea81bd8475267fca202b1c514e9d2d0..b6ddcc192ea85c9d95fdf6ce50e1638f430a432b 100644 (file)
--- 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 c5fc9584c6661dce3dcfc2d98294a8c17c180888..7e0480b2299caee5fbba66dfb8d8ccdc36400893 100644 (file)
--- 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 c8dcbd2c9feeeca3c7ea7d775fcea31e93bc1478..7350256a92ea5a757ecf602dffbfd95ddf5c2f25 100644 (file)
--- 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 9c9f558512a2b26ec271a9dcf3fa23acc04159ba..03989bf02424fd108a97e8a5dab46eb5cd0319af 100644 (file)
--- 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 0fb615de709908246f86cc12963d4e27085ecf8f..95d0ef1aa149c68e448530c2c52380835531b686 100644 (file)
--- 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 65df41a31cb73b84419e29474ae53c9d33e74834..b64904116f6d336faebcadc155e18a3683ca7271 100644 (file)
--- 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 42cd934916e3d87775bfa3143c34053081599a65..186b6f1b7955cc273c0f00953ad1ea3612c47af6 100644 (file)
--- 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 05a544f13f0f310dc030a8d75a9256f0558a8058..55146a1341e8d23a0ce07dc8a51e14f1372dee23 100644 (file)
--- 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 a70f84f4d62f39e2e7efa3fadc9becd3a364fb51..5258593acd9d7674c2e2a034cad5e1c95b3a30b8 100644 (file)
--- 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 b66c2160ac838b1c62de9e885462a1faab2738ae..cc874bb09d76cd7facd6f490db6f947ea7b391e7 100644 (file)
--- 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 7d7194dcdd77ac79d760f169aed8cd8079d65978..4507b53a0387045aa908c474f9468328bab98d7f 100644 (file)
--- 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 beaf6c985d2432b48464bd3ac9fb4beda18fb80d..27756fcedddcb82c40e01db9c3cb50114f012c57 100644 (file)
--- 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 224c94a960e45ae9cfa52386b730d26ceb89aecb..e7d92078be7df62eba8081a8d22a11bf86fcc67a 100644 (file)
--- 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 3d4e6d825ab17827c70b8eb57a690fe058bed685..04acfd97517857ac0f13b649e68197edf6e7bc89 100644 (file)
--- 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 5f9811084afd70468803f02363017385d8b88bcd..5692765ed78563e42369853866de510f7d02c78e 100644 (file)
--- 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 6dd6b0cfe54c0cc0eb0fda8c4bc46ac542f48992..d2a83365faf643bf20253b196bbd726d55678ee0 100644 (file)
--- 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 d2050c7a34d7bb227054248ac221e49d6be8cd95..1e8662ee6a0ef2572e9c21e631ab1efb1230bb55 100644 (file)
--- 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 9aad3e1a62a0dd8e208953fe452db8187589b359..c73729cd0f133ed21ec0ea0876f02f5d29e25eed 100644 (file)
--- 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 bab6c9220678cb6d017c1e0e5b10f82973a2f7d8..df324b523b9ddddfe40318a8e19870895cb728d7 100644 (file)
--- 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 c91d4602d84f89ab5446334f281783fcc7018839..c0f7b529fb666194149aff9224e5698256c5e5ed 100644 (file)
--- 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 c9425d8d617165a5701367607a1d5cd40dfaff85..151c69422f854244ccd0f7d9a1ae6154a6872134 100644 (file)
--- 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 da0fb2e5dcfeb35e8c734fb18d0787ecfe09011f..b6d8d001dc2858a6016ea126fe158a25a765a518 100644 (file)
--- 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 a6945cccaff0eda2f1031243a92bd58ed107ede8..aa9d4ec0daf45f6bf8f253b1a4ae93b5fe5a6770 100644 (file)
--- 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 c5d6fb6aae1e858a96e26fc9bc0d62c90e0318d2..78f894eead46277709d5947b6530fb2cae7ea505 100644 (file)
--- 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 00a4b60d8163bd85ccd020b5344111f42f7fb9de..ae62fda812f1e487b76dbd9c2c5f8965bc3af3e9 100644 (file)
--- 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 f072c649e725292defa48f8a070d8f2661d07e59..06c7b797dd20ff24899eca558d2c09810185ecea 100644 (file)
--- 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 341f704d4928eec4a3394698c511e0392a4fea36..0a6788b721cb74faac282394f766488b824c2367 100644 (file)
--- 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 2e02fef4b96cc99482da53e43bba5498d3b94d5c..40f69062c87ab984f8dd45ca901c4bdb4ede02d4 100644 (file)
--- 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 f2403a368f5a3badeb2de59a1786f6b1ce52d93d..e15c34a13006101549cc817c8f53cbc222c5bb5d 100644 (file)
--- 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 de433734b05835d66096f8686f139585e45c43e7..a3f80baae5ed1746463e5ad36279ce7ff7327d29 100644 (file)
--- 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 e5a42dd4a9f1b6c5e7860535aa78078952d1cbb3..7940945ab865e22913c01965e8da65b1ec05ce28 100644 (file)
--- 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 442ab2880ec589de1746cb4b2ddaec91e1dfd3e8..b0c549d46b0a9331452f900ba90576ff8034608a 100644 (file)
--- 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 e39db4670542c99b11472326adb63e79a7545be3..b377ae779cb7a6a49e791fa065955d70d0bfabe2 100644 (file)
--- 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 92e65f428e5433476e87ed9b07446dba34b83b36..0f4b905bb84a57b3672da21d3e81fd6117dcd601 100644 (file)
--- 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 ac5599967a9a7260ecdfae67bae043193b310d20..80ce677bb89ac43da85879551960a64e49db31fa 100644 (file)
--- 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 3d9505e889615ade13993a4288a7c0b202994bce..aef8d87473e863534ede48449f0a054f11d703f0 100644 (file)
--- 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 586805b78cf27432cfbec75ba4a09ea7bf90c9b8..a94ab67eff1010c2c681bc1f882d9efef8a58826 100644 (file)
--- 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 9fe2dfe2618e026d0fee27c709183edf8bb94721..dd4b431e37dcfd346c91b1fd7e50f70510574bb8 100644 (file)
--- 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 1e335bee3800dc645e23790572f3563fbf03c8ab..114de9421e596fff08937d998cec1385b58ab91f 100644 (file)
--- 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 858397a25f7f8db1d8a6b6c78009684e606cd848..4ea429f7f71574bd6f30327c758e1f72eadfa4a0 100644 (file)
--- 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 ce735dbe521fa043b045b56863d352ff04f5c02f..57733812e2f97f4fc0b05cc17578f6d781349462 100644 (file)
--- 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 117579e84640aed57a26848e011e8277619e3ed4..772f456bee8a49244e1f7ed233a79ed5bec6abe5 100644 (file)
--- 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 47aa77b8dee42ed7d1b9e52c29f9a1331f479736..f3df54738e544ca338751c2b7a18c4f9f5097d3c 100644 (file)
--- 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 42ae1a614b60f67e68e7581dba7e6b30b8aecd29..aaedd38d514b1dcbb9969b3b284952c5bc6715f7 100644 (file)
--- 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 b60b66271e3520549ec748951936530e06dd7074..557dd51b2711f95591dfe483defc6ca75d7ca877 100644 (file)
--- 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 cd76881c411e1db90ba118ce7a107acb4cde0338..ab98f68dd4c98fff159da1c72df86429b2307cd7 100644 (file)
--- 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 2e62a907c55d40d9d92c158b618baa28432da960..af5da63f26370213bb2472a2a26becac6ec0c169 100644 (file)
--- 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 db4afafdca245bb1db047b5c0b1586e1e10a577d..9aab39bdea65225cdb597ac76cecbdaea5ecae3e 100644 (file)
--- 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 eeb79e6c73879e9769a43509efb625b8659c7565..74c93a085d84ed7e91df81f5f16ef4d1f6d43214 100644 (file)
--- 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 255ecef349dee71f1411c3e1cdb905ec2e20b6d9..0809141e20ce5748f0dae9817e8b38920706d2c5 100644 (file)
--- 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 d8ec85dc2877d445c9c1afa1e3e683a3fdb437be..f6d990d96d5d241119313056325a2f6527a57d18 100644 (file)
--- 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 3552582b036496418e130fe77558c89ab0fb1803..004144a8fa43c60ed35165e270a6f2eedeb87e5a 100644 (file)
--- 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 19e2e5527b0b8a15572e37ffaeb900c65fe668bc..ad18629d35e0e91cb7cc51daadd1974b3221dd45 100644 (file)
--- 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 a77ac9ab5b9865463b3b486a30afe0f8796b38d5..31c67345583220d6984e9a89b7075dfd3f6d10a3 100644 (file)
--- 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 93107d6dbb0682ced8827d78c61fb1e0a6533983..6d91a6f9ce0d016dcbdff18fb9a925bf7e762abb 100644 (file)
--- 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 5ba209af585f4e47e6c0fda098bd63384c4318ea..a3bac7b5bcdfd427f5cd377b1239c77a973b279a 100644 (file)
--- 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 65095f0c0447de5263253d9fe04ae8072535b639..dad843af197c989e39bb1bc21bd164020a5706cd 100644 (file)
--- 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 b720a80c2958a8661357201c9471563f54f60b16..b05cf02a5367437a903f470eab7df8561944ef37 100644 (file)
--- 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 08a87a3f49eadd4af7ffc8b6a37395701cbf9849..fbb674a35fdc73925df41beb046bf5fd267d5cd3 100644 (file)
--- 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 0e9136bf338c0b6f24e0418def5ed93c6cb63176..17d4ee58ffa75896b5ae4b4a651731935edb0ad0 100644 (file)
--- a/test/confs/0288
+++ b/test/confs/0288
@@ -2,6 +2,7 @@
 # serialize_hosts option on smtp transport
 
 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 66734518aa8b03fbb8d64bf7f7794c8b29e7b493..0c4b1f28d7a47455ee5bc60cfe69de1a51321a45 100644 (file)
--- 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 57e328216a30984e6a30d9c31ecf37f638c5cdda..5c4a7aa188a474a21063fd6cf714510c362810a0 100644 (file)
--- 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 8eb6af2795666185649b38bdd74a6ee568c0ed28..d9bc47e63348632afff3c954c2eff00d65c001dd 100644 (file)
--- 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 a388ebd3a563bb6984a0cf30743f7831753f2ae9..3fdbeb29982d2a2a5d80aab0d97d36482c750db1 100644 (file)
--- 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 84f79b88a3e988d4c64152f93cdef53f73840a73..4a57eb37f3af41000db8b416d7cd63eeb0fd887b 100644 (file)
--- 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 6b8a6112ea58c7e7a76c05060b1d2b6607f07eff..fffb9ed3f57d906a996170540785aac85481b964 100644 (file)
--- 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 ea16f79d7df17b5b79b9e68f6280d23a8ae2cff4..04e5b36a80c3c778a86e51c793b77d26859a4960 100644 (file)
--- 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 fe75315022e4639fa26923b7855c02da3d09afdf..9af8750157bfd253d6306c0a2edfa3b72c24982d 100644 (file)
--- 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 8e692b69005a90635b99f67819fe1a436f4dbf5c..fe5616a40deae0ee8e10ca7bb596a618e392e60e 100644 (file)
--- 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 47228e6af1d481d6841307623bf295b1d3dddf63..a6cc98495d1ab7bea7d0ba76a833498d120df6bb 100644 (file)
--- 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 619132bc7b3dafb3a9f9982ebfbb23ed46bce504..fa351a774ddc1e72c55f42a5d5af9a24a2322e81 100644 (file)
--- 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 cf47c2b7921b8daa83c3bfbe1fc67a1658cc6517..ce36a036681e03718bf961928919f9e656dbe386 100644 (file)
--- 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 493f5a0dd08ff2f8ca870f13b0288149ddfe788a..4e1aab68e7806885c65bddfb529724e24a85cebd 100644 (file)
--- 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 41c7af7fecafe5960ed1e5e2becdcfc819e8acd5..275f6f00cfd5c7234f0c3ac753474a9b2478d90b 100644 (file)
--- 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 7670b60b69b8daff39be6bc4e39671369dc3da4d..d2613324e49c542704807013ff094e7166a096c8 100644 (file)
--- 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 7f1e658bdcd66984a0fa812e316ac38a469a9094..5bbada409b9d8ba4f0220c0d1ca477d01febc6d8 100644 (file)
--- 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 ceb51a82aee01b7f5090d2cf52abc8a3bd333f01..14366f6b58a068d21aef950553389c6b60c83662 100644 (file)
--- 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 2526d9df180a90c76503f710a7c5780fadf4d707..6e14b31dd5ff10aaff1c90f4c23fbe353f12b314 100644 (file)
--- 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 5e664452bf59367438db514757b6bf6029f4554e..db499851a8d07dda2673ecdca06bf2e22b0e3e52 100644 (file)
--- 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 cf90b6e2351b41f7ae86b70c89c496e1ba3d8f39..68a433e66a3d985fe6eaccda795def1f84b5cb8d 100644 (file)
--- 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 2f7ccf0c3d73b62e6873942817a4d40e06c30a53..05f6893ae1e86d84e19836d437d1045ce8c5423b 100644 (file)
--- 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 45eab9213ae0ea6ec06a5c077eb7538760fbb4d1..44953ba85da192b7e7013daf04bc7bde61bbf380 100644 (file)
--- 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 5f7a791dd36dcdbc786bc1b7f1d226f36106b866..f26236f5a6eb7ed06f92f38adc88f0788d2cf78d 100644 (file)
--- 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 78a56c03e6c56420c45ca59d87b131c3afb87574..590131b0057349dacefebe7fbd101669847be0c6 100644 (file)
--- 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 64e061215d7e3ebde897d062ba70c38b0801110d..5ff28b23015e0ef098e8329658c588acf84a57ce 100644 (file)
--- 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 d9a06607551552119ae15207223a99414388ad93..f5269589274c9cc1e335abe86af6d6a3e66f1999 100644 (file)
--- 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 afa292ddc765d53565d95a842d2f8934c98d297f..7566ca2b6fa02ebe92ab2d613194956d9e1ea51b 100644 (file)
--- 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 1a6238b8c7032a4930cf77088c16291c25cf8da8..b26273c595a6a2282cd6afbf99150ba190f953ba 100644 (file)
--- 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 2c3e66198b5fb2d23db12f2f1d7724f2c8625a87..cafcfe9cf0cb645177e8415f2ab8ca08d38c323e 100644 (file)
--- 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 e57fe8eee8ec14b947a7f2d035c11bdb9e80c7b3..fcb3c454cf2b9813f3e945541604b9ec2af1a6e5 100644 (file)
--- 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 8a279a521127e0a2291274365048fb44ba04cc7c..68cff3f890772599f99d83661b268bcac7ea4936 100644 (file)
--- 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 e9191ee35877864f6365633e74c486d69c9d45b7..cdde86c8550aa7b34c704d05cb923aea1d00820e 100644 (file)
--- 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 6ea0bcfe91db894a47b5c78594681c7fa8963657..b32615a6b1730f48965781cbc358bf9689acb651 100644 (file)
--- 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 2901010ada9375f9fad92b5a1dd46b5f50edd793..94864147aaadd1fbd79ce954c3146a6243387714 100644 (file)
--- 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 253f8372c7f870716472b49343fd0973f4d24ff0..3eebcb2e3910638c68dfff63c22d139b6a1b1008 100644 (file)
--- 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 e1353ccc1c8cb81f7610aba7c2ea1faad47b31af..1c946102ae38627768c5f8c6de318042b8ceb579 100644 (file)
--- 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 4d145d851dd338d3fce1018a13b9a938a4d2f128..2a5bf63774e00a853843940e1c57286e087d22c6 100644 (file)
--- 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 5081f88a2d9d0ede1e2eaadb792015f1116707f9..fb9b5c945fa247bacf589ab01589647dfe9bce0e 100644 (file)
--- 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 28922ed73e5e4448d160a5d837cc7e3a84242359..f3216575c20ab3a8e1b3aa36cafc62664706c8dd 100644 (file)
--- 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 48d29a4a3827103df770783cbfaa5250f405b244..f14d1c7b6a4490f29ece9aacdc7f0de532335e58 100644 (file)
--- 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 1d853fa9160d0435306607f1c0201fa82519db18..9529207b2414c68345104f40ee23d5c6c9ab76cc 100644 (file)
--- 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 9d53d7a797edc8eefeb2d3f3dfdefa966a759d19..b4a7a164a85c348b76036b745b4058d884bf9d9f 100644 (file)
--- 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 934030529f799075e89d8ba40b42be081c1c6edc..8c62e22985865a692fb10a4225cabd6f498d978f 100644 (file)
--- 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 bf16c2ea75b09cbd1c490270cf1457d37dab89f1..5bf3a093b68bcb084ef1cc607c45a3c61722821a 100644 (file)
--- 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 3889873331f5809dabc35be93fd8f535a718d614..ed9e665db98f45e97d2fe7709dc7de8665ea11be 100644 (file)
--- 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 a04081e52020f844b02309028ae621d6a6110a82..48951f992be15053a3c279ef59f54cfe12130ee9 100644 (file)
--- 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 e78f4ebe14fcef2c60ef3e7bec962491f5bf4ff9..7f236cf36faed781dabd4739779daec8c14efd52 100644 (file)
--- 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 d85ab8489a811add07fc8378ebf9b3e962a57a0e..b526359593351de4fc512a2a8519c337d56c801b 100644 (file)
--- 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 026d4f72499fe9a1e3ef19129e6bb092a48e0143..3fe87dbda5a139f6eb7c9b83be739fe8d5e2a6a1 100644 (file)
--- 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 1ea147be3747a9ad33d0fe72ae8569d7bd8befe1..a721b55b90202446e080b30b4e8ad3675de90194 100644 (file)
--- 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 8048352fd664f711688960ed66245e673f478961..1f877ec49ec32698a1aff7a45783732bededcd56 100644 (file)
--- 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 a824813ac3c74fcb645fa2a08f8292d7f968dd7e..f9a083ff9f08dfe3cd6d626c0861ef5a6e6cdab2 100644 (file)
--- 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 f873809e28b43668c4f390a6ae6ea0dd5d465a84..b8c0fb9043e2c030323d349d56903f20b173c348 100644 (file)
--- 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 b0053226a9c9350525b0eccca197fa90ea80a71d..cf11417618a0605fea0893730cc032c3992b6642 100644 (file)
--- 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 2dc7d6e49fe21609029ad9d9b973b766db46f218..52f90bc1284abe368cdc5cc40bf7bf5b3cf9e29e 100644 (file)
--- 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 591294deba95944849794d6c7b35182e561163ac..1f067ced2b8ddd793204c58c2f02fe1b4a805974 100644 (file)
--- 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 d57ba110092ea3235522c6ce52ada78195ec1cd5..d6456345ee1e23ad68e86aceea422e698d49a505 100644 (file)
--- 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 9d648dcde8a652897cb02dee98bf932bc52ff62b..de9e4d076f77b3e4823df4392721abd526236755 100644 (file)
--- 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 5065242792fd87c6157b54020b7f05b321ec7401..af2fef817a51880b274873a32eaf2129a7ca1110 100644 (file)
--- 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 651a94fe49f2fe9b1c583e76fa5e567078c8ec44..0adeb040aaec3f8e927e4947cb965b98c54efa81 100644 (file)
--- 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 ff3bd857e7f87b53a00717b23a139ce6ed4f5a93..411dcdcd983ee3175e164f086286688bfd2cbd1f 100644 (file)
--- 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 a3d60694660281a710c9e04aa7c0c8462e3132f4..cbdf68ecc347bea9c728f1d2cc541f69a327df5c 100644 (file)
--- 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 0c306f5c07fec633408ca6f75b652bf9c8bc72e7..7cfe1a2f5b0f397663070458a8de49b9b52d91ed 100644 (file)
--- 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 e3e9555f3a49da2bcf539b40314518f221424288..8bf302e7e13b460b99fe27f177f98db5239cc1f6 100644 (file)
--- 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 566cb284ccdf31636073e9259b810c422a29ad01..d3504c69d24a78ccd07d51621da4c16aae006a4a 100644 (file)
--- 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 b1b92692d417f5de3872144117ac51fe218d178a..5446ae876fbcadb6a0c3247b84fe57ec94319406 100644 (file)
--- 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 7523892a9dbd6932d7c30ebe22b18b340f68e900..73dc6b1312040177db2afc5f8606b867e5071792 100644 (file)
--- 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 12dc13ab8098a9b11aa43b5f55a00cd0abff8032..e96eef8d1d17188d10c709efdf0c6b515864d97e 100644 (file)
--- 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 45ca7d3204bc381335f6c7f0d7025c11422e39b2..6fd1bc65f1798a2e02b759c4d7c34e33922f17d5 100644 (file)
--- 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 d6665da51e6e92be1fad9e16c0dba6a9b51419f9..8dd6a80b36a14274ae5b52f884d483fa668423ef 100644 (file)
--- 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 1975cf3789f99e9a0420720e5186eb7f2698f82a..57fc1c2276895edf5d0792bc46cdc3522d3d64d2 100644 (file)
--- 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 b24010459fd7c54791f3573a518780f08d08e342..d5ecc90092f977e977711dba2f21b7d30228a9ae 100644 (file)
--- 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 275ae21a48da16f4f66473128ed50c3706b082cf..dfc29deb899e3e82636771319778f99a19931053 100644 (file)
--- 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 15ea70fbe137b69b0f58a9df8710f2414693e22d..17a252c59565d1e4e4deed4e5cb234ef4c3373ce 100644 (file)
--- 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 bddeb243ef06919df670fbc9a90958607a6427ca..e5bf738ca80d2ae7d849365d32240303e8a0afec 100644 (file)
--- 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 706618d1b0bb69cdfff20b432b78c3bd274528f9..4192bad16dfa8f39f64b1610f41c152321d7e0d8 100644 (file)
--- 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 dbe113d28fdd274f774a9e40c138f130fe9c0588..4cbc22d33e3cf5675e64701a8e314415e8a2ea7c 100644 (file)
--- 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 ec639aee700fa24e6fd98412fe9e99f25731d5fd..f681f75c9949148927eda94acecce7434f44ec80 100644 (file)
--- 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 bf743c8837be8dd55d1d2a1255d5e4a287421831..10174692a4595b68ffbcc39133c2a6c1bd811f40 100644 (file)
--- 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 08fffb406236a2800d47a72c35e39525ad6dc4b1..466257414a448b6694900d7e2c7fd008b71d9d24 100644 (file)
--- 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 7829414f182b163b38f4b275eb68bfea3278bd51..d062137dbc78eb909cf34d42532fec8c713281cb 100644 (file)
--- 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 63aad00bed625a62d782b4253cef4666e668f48e..00f3f458b3adbca7837e8e3aad522ba418b7d144 100644 (file)
--- 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 680377fcd2d38c24d9ef1352cf47701d9d7f1c2a..b2cf41dc61550502e7e20429ff9aca87f13e4b9a 100644 (file)
--- 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 6e457e7f5aed495d43dfe871b320ffae59e9d3c5..b08ac66c4126e2c5449cfed581f3c6673ab9665a 100644 (file)
--- 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 9f672ced0bfd91da609096f6225b5e5a843a8937..16f0d637e51bc8bb1e9bf8ab5b764ee9bd7468f0 100644 (file)
--- 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 87b3e182dad711d4112e46ebc7e132e483e5d5a6..4361bcc526e9493e4c80f74072406ab6a1546c58 100644 (file)
--- 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 2292302095348959583c722620f6a82dd59c8386..3b622ae9ff72a26a95a3c5736be24e98605b40a3 100644 (file)
--- 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 de6feb6d14f11277e9c1b500f20f6cccb01b2729..04731c975f41bf6f41e069c75d9ff167e5680737 100644 (file)
--- 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 362ec37f18944bd2ce6b93accb896e3472e56eaf..3d77e208d08e036e0641d150f242535f3b433db8 100644 (file)
--- 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 8046c87f85fc3c454763b0726e9c83aaf3a05bcc..5604eb32544b916df2e28fffa956edfa2c1d2fe2 100644 (file)
--- 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 6dae00b93b1895d2e4b19d34f9bab92fc0223abc..6342780fcb6217cbd36d0c86cd27861fa660adc6 100644 (file)
--- 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 4b478d3d486841ce326fc35755eabe1ba4026e8b..5264a7d83906dde4446fae7666c8c06681c9a08d 100644 (file)
--- 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 02a84a85c1d01a0def7a0a1fbaf8be83a87b1d86..8eaa38fb0010d4cf77931631488d6bed88e07f03 100644 (file)
--- 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 3dae69dd4b8e43bda3703b8937b558a5c302d5eb..f9d36eebfec33eed2bdebe5adfbef7c800ebae4c 100644 (file)
--- 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 51d8f8f37cd8c7be280bd4f93c4e2faefd7d147b..034ccaea972776bb525b01be3b700a84dda2d415 100644 (file)
--- 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 0287358c0dfabdfaf9ec0d03873b49fb51c1dbd3..5ce6fec0509146461354c58aab8e188341c5e905 100644 (file)
--- 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 39689c55678fb77d0a0d8be6e19ff14e18c426e2..baa5af0408eaeb148384216b4703b96e46623b12 100644 (file)
--- 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 b466066a3c68e00921dbf9990d90b93e3f9683b0..7e8c487ae336704053fb331a561175951f98df3b 100644 (file)
--- 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 4193a139f6c39fe52eb711a5baaf7b036ff73b80..0833efd483029e1b22153c4c7e9f6f995b51da12 100644 (file)
--- 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 38166b449395db940172e3cc286c26f67b9f241b..54651ad296287b122dc7370a7a41a35eea0f0f26 100644 (file)
--- 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 fabc1517902aebccbd63cd0de3ce79d4302b0564..f06cf19dd356fe5a21358bbfb1d71da3ef85c8d0 100644 (file)
--- 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 5b88cd7b26c75f2b5c809748fc55aa76de98ed7f..5fb58925515cef83438a6641241dda5c9c5ec604 100644 (file)
--- 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 a2ee5ef9da1c659cf5eb5e1aca8ef46742732b38..4a2f41474e354045aa2a4e5b2595b743574e0009 100644 (file)
--- 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 ae809d52f8173b36aad837f15e91095ad743ffa7..9b062526baa2d2c4ae84ff003557cda586898aa0 100644 (file)
--- 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 d83857170d90de801dc567955571f57841f92d1e..e75af039902b7441594a8d067835120a1fc0ce59 100644 (file)
--- 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 7e651196486c4a21e4a725ff870c1ba16018f087..9a71beef9dbf5ee57928af4f5b916c902bb385fd 100644 (file)
--- 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 4e00be81339f14d1e1e05d112c35e0f562275a79..5962ad34a518af9c04ebe69e52143541cbe1c7ee 100644 (file)
--- 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 2dac89ab9c3056821992afce12a4bee606214563..3d06554d3aa38c302f97ba0d94d756fc231f3a1d 100644 (file)
--- 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 50403df7a6ffe5beba8e10369cb00a6735f85a92..0fe3e8ee2fde6184b7df9848c2672449a70be892 100644 (file)
--- 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 0bed7ddbb92df1414fcca68f1f6fd9a1225e526d..3e3f5a589f087dcc5349bfb85650015ab3fc87c3 100644 (file)
--- 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 38da70b6c24e130a64136ad7892dce2a32b1e8f2..ee9b4f6c79fdb01f9f3a22d5da0ae4b5f1e5e81c 100644 (file)
--- 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 2c44a2b74e14de8c2b33944f3e0d462d68887122..05ffaeb454de89a81b10687036f58519f3cc4f23 100644 (file)
--- 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 bd9a15c825d323da0b11e708e4705f196bf2e490..dbc77005fea2902b3db55ccf6626046aaa7c2ce2 100644 (file)
--- 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 9e9ccf9569eb79367c7ce14c008f0de06be22b3b..f83c45337f320e2ba1a9892a8388c792f87d08b1 100644 (file)
--- 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 bdc84841a08b7925e6ebed68033714cc88c86486..a4e5f76eb29b9d23d82226f027211e1a2b34901a 100644 (file)
--- 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 e9b23f0f09f5e68aa6945ba2a2586503703ba466..76a1f74f3f8c6d88102dc0305140962a2f51a463 100644 (file)
--- 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 d1f77cd829778e90597b9c70458758be01e07831..3db8b2493a941c3f69fa43fc97bb3db01355f069 100644 (file)
--- 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 37b6bab07af275335357e309680139c4898f69e3..f517624ff146ed7a17fb8c443997f9ef7ce6a5c9 100644 (file)
--- 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 3647861993c4b9d1b47ed48b3a52c82a24120f8a..9dba8d7e0c9dd87aa9f3a2e1a963a9c25195c965 100644 (file)
--- 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 6df40fa9e90ea30fcbde3197baefc95664276a33..413a50758e1a816ba96e0bcfb5ab4ecd17872a28 100644 (file)
--- 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 c077da26b48aae1b61d51918ed151bd012dc5fda..8f6564588823f2e1d260ecdfeb761163af69b077 100644 (file)
--- 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 8fb017178cccc4e9fc9bc8b1e13f046b6806cca5..dcc0f64199c766e4b5a691f8be4d85325234ad67 100644 (file)
--- 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 c2c23850753e339bf529bdfc4a726d6debf2fb5e..aea60f89745be5380b9f2605014f33810198d073 100644 (file)
--- 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 9a38058d704b7783c7baf8baa52a8d5d094503ad..fca635748ed376cced4085c7b4f9a6f63a705aa3 100644 (file)
--- 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 e0d4fa329f035aef4ddf7a539c068c8f460e228e..77133f8914160759e177fdc30f599964e0714c32 100644 (file)
--- 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 9d269d9594e6d1068802aaaf33afa47f1cfe6b74..8dc486e1717973f40300fa74dd88c52859d029be 100644 (file)
--- 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 aceaacc46b903a2dce8e1f046444bcda757b76df..1bec61aac46f718a525417397792741ddac6e944 100644 (file)
--- 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 2290da4b3c77616f9251941f1449ebfbb8bd701a..58b7505ecc7ca2bc99a9a7f627cfd41f99dec629 100644 (file)
--- 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 f759e63d66cc82c4da617acfe78dd4d745f7981f..e107c5a6eb8ed55b5c75f2a696ecfc024ed8f344 100644 (file)
--- 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 b44214388c6eaff3e0b1e84b45b37de5b04ce3b0..f6d7bae8d41cb9699346d6bdf88dd4f74bd12638 100644 (file)
--- 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 9fcf361db389dfcf3e6875f20cc88801d5abd949..a8c7d7d6d0c4ff933c8fb7744cf1a6dd1f343a43 100644 (file)
--- 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 38cf50c2267a972cf325b720d6d67265d78e0cfc..242b00855bf871549937a2426e9a9c1e10871601 100644 (file)
--- 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 a65df5fdd33b567e0ecd1e7138541beb6957c72e..6b1143394e356913b4d1c8a56c3e30f78b61f411 100644 (file)
--- 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 5ad06071e3415fe4e8daa47684eb0c6cd110d77c..567bb7853cec6c7ff2fef6d1fa9864f6fadd90ba 100644 (file)
--- 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 30ba84b82bb0f1945ea5646063c8d03e626ad71f..c6228f7e121b840a092196a2e51d1f855ade4b4c 100644 (file)
--- 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 902f9ccb8d2989e19a7d48b23b30c47752fb09ea..0efbd639312215f86b89fab24eb6aaba59280b8b 100644 (file)
--- 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 5c4378fea2d794c67eea2d4964b149a8184bb916..688cecf2205cf9438acc6c5e6069246773c55188 100644 (file)
--- 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 f50d54067d4715f1258b22edd00912b985135110..70e9a1a4358b5d221a160c1d28e109e231d2a7fa 100644 (file)
--- 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 95e6b5264452ef08c455c843cfa16128f5818ac9..68f5512aa522faf5fb5e04ef9eca719202b8383a 100644 (file)
--- 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 0fb20a14a8c60383980639ec1eea38b6a3c70635..2c14aad61a0c008daa71425d0de0d9b56303f7cd 100644 (file)
--- 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 3dbf4fcb249dfc8d748921328f8ad7d4431f8dfe..b543b05ca88e0f60b62a0f933e074ebe74c8d7a3 100644 (file)
--- 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 b38f3057b4a5ebb4fbe27145af0198830f7de848..dd3a96ab061c078acabd69dbf30f8bcbed154556 100644 (file)
--- 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 33b3631c377584cc9e8eabb7c50d428d13aaa40e..497481ef317a3769de0d8f30f50a42d7ca50fc06 100644 (file)
--- 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 ffb97452fc69740c817f4b213a7dc456bb2962c3..bc1dc93deea54220e88eaed5636f1b45f8dcae80 100644 (file)
--- 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 4513f6db0c7f84df168393e21d7036d122e5ccf4..81860a5edc35552d48c6b4aef1d382f7426f26a4 100644 (file)
--- 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 5616b9ceea0dcc96b87491f9e6aebdccd4608028..aeff22f83adeb81296caadb8f161447332b109ea 100644 (file)
--- 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 b251a01205a07925e17e0adbaf1996db79429a48..92dc1abb808e6bc8815168b66b6568805bc1dbea 100644 (file)
--- 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 9c24f1ff59ad5cff7d80207ecebfd0c03c40f214..c9ac15027d051f7c03a6681f36758eb5986f1cab 100644 (file)
--- 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 7e0583d799af037d043973119b87962349008fd6..d0ea77ea16cb052d3818763b0eb22f870af8e618 100644 (file)
--- 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 58d617824308dc568aa70aaa18ff996af939bc00..0a966451c367efe2bc55ad57a3979ee722ad3c6c 100644 (file)
--- 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 c635036343421af0f37d2627c05adb3a2220c121..25199dff8a54d47b8ad3f55adeb397e6641ea728 100644 (file)
--- 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 6a61c130a524419e4c786836545e87def2607653..7f264c84d1ba7f8f2b4e7ebd2ff0b39d92d0bac5 100644 (file)
--- 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 3e10aa309c319effedcf02f15b3996a325cc13ae..89adf7f97e47bb161271fafc563910f14d22cc6a 100644 (file)
--- 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 29ecc15685d0b442c06c95ce0a461b02619751ad..0deb598c991fc055a301c8e87e107ddc20d8d8b0 100644 (file)
--- 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 bd5dad286107d9bae2e5195efbbda19439841909..df03b5dfb76748bb46c8871e650346aaa2b6e596 100644 (file)
--- 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 f6dff0169cd6c6d33b91f6777bada344d60046c6..182d1021accc7be56b2d197ac51431dd6f9a9a5d 100644 (file)
--- 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 32d3c654408bededd8e508eda51ae6bcdfd69d2c..5d1a3e92d29b76eed35fe8effd128cc6261f4bef 100644 (file)
--- 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 8adfcc6b17fac4f3c8b4cd0039c6de38938b1931..290ea60beba4407e52dbd5a4810398d9d029e9b4 100644 (file)
--- 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 112978f88a63d23955877b3753829b935a8ffe25..2b4e5935f37d76900b179cab1c257835bf74588c 100644 (file)
--- 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 cccf16498b0a6733c8eb33b06f320a86cd68f6fd..cadec6310f44130777e671ea94666ed96a9cb01a 100644 (file)
--- 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 2d8c2f51e6ff7e37e145981b765bc232b2d448b5..6345b5897683d5bd6e60af233e59004e75e6d8df 100644 (file)
--- 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 409098d3088a7cc4435de1900f4ad80bb32d6153..511362db52785f9b0f7b841f975d75c13b456283 100644 (file)
--- 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 6ae4d3c5ef88326f0b828b94ddd28e48f6c577e2..0e7e0b14e8edcc390c7ae853f1b6562c1d5373a1 100644 (file)
--- 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 a8531320b562b41a16bd2575e2a41fc12b7b0226..f7b7aa40aa02c6c09f465b4d210cfb9185df8b1a 100644 (file)
--- 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 e4294aeb2d097f40a144d1d93e5a9abcb994f617..755a9c00028cb77781c324d5474bbe8135d15ba2 100644 (file)
--- 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 bb4e8b79e0e0970af65aeee8d259842851ba3548..2afdf517bda479b16e0a5a5e204d586e9417081a 100644 (file)
--- 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 d6688d932b8c58dc10c78c486abcd10dd8058b57..5937b4f04a8d4cc2f04d420a8f1fb483acd76268 100644 (file)
--- 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 da9814360492c198da5c60e52ae7a60925f333f1..b62274ce944defbd9d0116bbcc4eb6224ea6e366 100644 (file)
--- 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 c3538607e3299b8c3e84ffc3e9ca261aa3ac3c9e..b8f3d6d144944c1e497b62cb4e6d829a805eef6f 100644 (file)
--- 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 bb6e4fcb345680e61731250bfeeae0a5db4953a2..4ddcba5f7f86e3c08fd90840cc68ac43996da780 100644 (file)
--- 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 f16dc0b3cd0ddf66736225fbe84ca9aed09f57a0..b07df6634297b2fc1d55cb0d44c65be695b50f99 100644 (file)
--- 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 aa53b972268e1e38c3c53d1520ed0826c9373a19..b40bd0ce6d2efdfcefbd207f7949476d866687f3 100644 (file)
--- 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 c78c2a94a55f8378e2ba32f24ddd37fa81fa260f..ac0206b1e72303d86c2890e9e386fdc95aa9ae40 100644 (file)
--- 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 9e602a57fe5a9ab6bb7bec631c073f4dc667d837..84b63e1e4ad7a28a2e6af9f38424b621f553cb7f 100644 (file)
--- 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 187ea46fe75d35d48dbc874b81024131372ad2fb..1dcb8bd18f8596a24ae3d42ddc67b259031f0e21 100644 (file)
--- 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 8a484ee8f65482c4d9cbdc9e02a59416c38c5353..ddf1afc797d15b8547e26670b404a7dea3a08ce4 100644 (file)
--- 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 877e04487be6d890e5f283320070e6a248989b41..35efd39a17b810856ca8e294337cf6f656862746 100644 (file)
--- 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 8cd7d6036fdf1881472a53d7d2e653dd5ef3489b..3544af28988deec47cf53b7cd7cded7f45e8c009 100644 (file)
--- 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 3d031a65d5b81fffaf2abbcb449482ac48feb88e..9479b2b0b175fd1ee922fd7a26c8b3293cae36a0 100644 (file)
--- 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 0baf45ba6917158864c000ba800b39c28ec002d6..9eb84e1a62b776c508108d515c3642fca2cc1102 100644 (file)
--- 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 51f5bdfcbe0e4d5a59994b4f88dafb9a0a79d3aa..8bf9e3408877c1734b801f17bf41d9099c707b36 100644 (file)
--- 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 aff71072466862457a3bf8fe0311155ae939e2f2..e02aa4ccd96aa6099663aee60bbc78729753ada9 100644 (file)
--- 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 bc6fd509ff573effd2ae140dd73067b3cce78ae7..d6e918816aacb6daed291c201fe3faceba46070a 100644 (file)
--- 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 b27bc6d8f5effaa12eae6b28b47ed5d6ce35d13e..6bbd93fac68a5dd1170e61199f683564d772245d 100644 (file)
--- 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 e9ea69db69537fda250026fb7c6c627643fd7d78..d733ff9eab06f6de4e56da87e1d18d3f51059c06 100644 (file)
--- 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 5a6ddc528ec4a621f4bc714cdac95343e24c06ea..bb6cfaf1c1e02076e82803460cbb65a74cdfd1a6 100644 (file)
--- 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 048c691185cd91bd7dbd9966cbaacb9ff7772bf1..4a38bec162504311f86e51be42508a1c51bf9f94 100644 (file)
--- 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 084184aad2e3c9e73068488cf07afc99742f02e1..c6710989502459ef4adef4640956e8767815e0a6 100644 (file)
--- 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 650552bb3b5bea52453b27449621f962a83efb91..edca4b2123b47e38cca8bc409c3c0a980cc7ce64 100644 (file)
--- 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 f3e11de230a0b6718794ba4923899b1c1c762bd9..243e47b2aa22c77a8f2b68618dc0d22b0d940b75 100644 (file)
--- 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 048edebd88cbbebb0e39c5f616f6636517dc7fbd..67462c3d2b553b09d59343c7ab232bf2ad8d72f6 100644 (file)
--- 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 0c0f2ca11a76d3527db6738bffd9e339032a0ba4..2b399144aa7f88e6d23059bb40183f0c8f2e31c3 100644 (file)
--- 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 de976c5b5232d19842e64ba7c3f3ad3c5148002f..c4f512fee63739c24a19f884573052808375d2f3 100644 (file)
--- 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 20b06d88ba74df2eeaa8f5e11ef5e496e0654647..7f590909e02c769633f21b4d6614d11e9e8e3c07 100644 (file)
--- 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 530253b15fc145aa91b2be08b97d063c78fb4b82..4475165fe93af3b88db5ba9964144fd1dfc57b1b 100644 (file)
--- 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 3837a20ff120e438ef3df058d2384d41cd7895b0..7c44a284542cd3a748762b0269a3b8f0b9af6aee 100644 (file)
--- 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 4b8a0dbb32d9d479d52a63d68d24e15d862976dc..b1864e9bd7efd51730745172da30359851052615 100644 (file)
--- 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 7104bb7f50e052476da3603fdd1b5cd79d714477..6b0a2a21c32e92fd82bcdb80f1c01ecb8b14b395 100644 (file)
--- 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 8776d80f1783949e980626fb29ec775994aace33..8511955bab18fd0908ab79bddab6215d32d588fa 100644 (file)
--- 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 e687e95e9cd82b453917e93b52f0b582ca5eddeb..ad1748eb1e748cf0944039207b2ed03f14e0f5a8 100644 (file)
--- 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 7148b9cfff21d46c02b8413e31be1c519b699608..fcf666062595fcc38715943ee8a81a0ea04e1196 100644 (file)
--- 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 0252d2dec0c016580e444026740104e98acff04c..e4acefb1d007c8c532f72f70975d03fa10f1aada 100644 (file)
--- 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 8a0f0e819abd42e34c0297f0042cbaeb34c1764b..a25b6ad7cc1b4f55abe77779ad06adaff4bb9074 100644 (file)
--- 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 0271d3b85067255c8f4856843927164f45f29017..8e76eb74355f06f3289e29f23a71711d0ee0c751 100644 (file)
--- 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 314fe92a44c99e706c287bd99171eed8b82aacd4..675490770c3f77dd2b4b286280ee0d4afb48fc30 100644 (file)
--- 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 98a9c3109e27db045925fc1f92241ef3910780ba..d12d4c07b865b824f88060cd406de34a9157c063 100644 (file)
--- 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 bb7c5e332f3764cbff580e61192b2b6413987173..a9585e006fa9aa586ccd03b0046dd55c57a287c4 100644 (file)
--- 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 c30833d24f32ad001333f9ebb06a434013e2ff42..6f8add61de5072633f832bfdbef7344b596a3dc3 100644 (file)
--- 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 af8fc81dd9d72e3e420f0722a620ce736960b86b..08fc066318fc82a56139f18f14d370b1daa4af91 100644 (file)
--- 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 f55a0ab75e776e2a810cb22e47200c212c8f1cca..899b14a3d60469d6a2dfac665c543f457e16bc5b 100644 (file)
--- 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 ff6d2aaea73055787953a7c2963cce9f900b8fed..0261f1ee3acc925d59457f30e667e742170b6637 100644 (file)
--- 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 f07b208937b92b73f0bef3752bb34ada7666ba5e..ac9c6eec6965f49efeb5cd00b4694034fbb524c1 100644 (file)
--- 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 5e18c7f73f579ebe4b3c9ae52d9620c78a7b5e40..6acd356e2e03348a9bef841a087d6f7a4ff4a187 100644 (file)
--- 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 a6ff74c403eddefc0fe13adf3c0c3729c8eaa5b5..a9df68e180247e4002217dc4c66dcd40e035e719 100644 (file)
--- 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 6dccd559a9f44fc922c498c94376db3ab5a03cca..50e3300936c36d7a2723ad279f0ef1e3260d9006 100644 (file)
--- 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 86f599d95c0a5e619d98a09af4e5776785e41d5a..687173b4a7983ec8cf8e449c11026687edacea13 100644 (file)
--- 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 27ed598355f526f39bc9d5c6270639dc15cbfc27..c931db4d3490f95b47c95668107bdd6223e8c8c1 100644 (file)
--- 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 22fdaa18127213ecd2329770a91c7d9967d254da..971de86e28b4fdfa179976dd67c2e88dc721e96c 100644 (file)
--- 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 da500daf8a76277376a4b373e16435d68b319d46..a204f64fd7f0e85d6143c01a3d43104790dbdc6c 100644 (file)
--- 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 c81919e7e13a49fa9957b9ba872ccca924f1a785..9dadd713933067f8a21cf885ac55030f8403d8ca 100644 (file)
--- 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 c45f52d6845547f09e865b7a83a23f25f0a08ec8..9ca2a3759a809375e51c40f51b5d6ab4286826c4 100644 (file)
--- 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 2a7ee7d6ea54b07823a2a355f70796fc4501429b..b8545dc5367070f7443eebc73b382a94a24eee8d 100644 (file)
--- 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 685b1955ba2628d5dff0add89a579bc3a5af3a68..af87c3011c4e56cb9b8cb85e9b7c32251c96d13a 100644 (file)
--- 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 202acb29fd86f3f92c9cf90c31f5fdbb0bd151e0..f2da0f30459dabe71cd8acfe617349676715bc71 100644 (file)
--- 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 ea76f3447f2265cc81e236f7f92077d2a3e6d46b..b023de35de19814d66b1619b37c910324056de29 100644 (file)
--- 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 d52a76950abd771cf5a6cbe782ffea432c6d4578..7c0cb1b7edcf15714cd7bb56cb4048e2a2f844a0 100644 (file)
--- 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 ad262e774e43605ffb6ebd886efbd4398c930c3f..af38a156882299a9138e01716dbc5605160c1e99 100644 (file)
--- 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 2d5ea226abac0c2a70831b1117de5b783427f1b9..086b880ec6833c98f222424552a1797d8531ebd3 100644 (file)
--- 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 52663742a97f5877dd75766f6ea2d89c4d236648..6094e6be24b7baf9d052b3465447ad7abb35b3bb 100644 (file)
--- 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 979f99adf360013c1f25e52765fba273b6f9ec78..b30acf42eeec31e4a34a66085dcf9253d41665b6 100644 (file)
--- 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 943c91818bd435d0f6e3e49c574223b70b3c3a06..8a94855493306d812686c1a91a6a0b842cd05874 100644 (file)
--- 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 f850c7c2f42a929957f1bcc299d7be83dcc74a6d..083d49b7b9d9da68571ae07830e6e9e53cc9b83b 100644 (file)
--- 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 fb47004fd861303c58ed8c82ccd8aac1b23b3f1e..b47129f146856377d83e965846553a1ef439f39a 100644 (file)
--- 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 77f60c86af9910ad3565bf5b1a468ee8bba3c118..fb282b6e708f9a8eb17dcaac614ed06920c30663 100644 (file)
--- 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 c3d9e6dc502d78d7bb8f8d1b8a798c3fc6249fde..15374f8e27f10634922bbe7cb2685aea819c90fc 100644 (file)
--- 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 0d73654b29cad2c1fbd1b5ac9770867eefa83cb7..a535db7058fcdaaf4cf1e7279baeb0f721225b23 100644 (file)
--- 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 04a0211f41376cdf51cf9d1de252ffd6f0c498b6..e1e736d4d9d6b836cb335a2b95f3d8f1ada1ec30 100644 (file)
--- 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 e4fabf60c011c81190b35a238a1e60b7b241460c..8d0df009ef2ee35f12208913b6cdf6f499ce2744 100644 (file)
--- 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 57d51952e6f116d8b8bf6da67fa0379104ec6508..1b312078f39d2e521f46a41581e939b65c40c6bc 100644 (file)
--- 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 a8de7aec8e8d30de11ce70cffa7670f8174ddb3a..6b08d9cf08ff487c8ba35e167fbb2f732a08b6d1 100644 (file)
--- 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 282047f9f53f1a959b4e26a1f57e9a5d22c52f89..52c31a55e69ae5a34485104f2761e2b690ce2536 100644 (file)
--- 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 c919cb65854b989902b621aa3deaa70c0ce8cba6..f1f9b0dc5bd820b3cfad73907616c5461436d672 100644 (file)
--- 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 a667231888b2362e2bf5d08948b125b454476b13..c7dc39e7ae72bd0de803e20d44bf55a7237f5603 100644 (file)
--- 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 4d45c2fd37489ce25aee5256380ae8f0e5b7d0ce..1ba2162c41dc2b9ad12bd812835f05609aeed55d 100644 (file)
--- 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 b0a3347b68efd3fdf32a58d04d6126b3097e70df..1d48005e318fbc423ba4654dd8e0845b9a12b83e 100644 (file)
--- 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 d2bc84a765f0a6aa74d1331f30c1331fc0cf2743..4cb89c98fb08dda9fe88e64f8a1c4bba5473a481 100644 (file)
--- 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 58cb1c4251953297c6ab7ea218c5a03b75fe1b93..67b4bbab6c7db9ebdbc2a46318b7e2c762d65778 100644 (file)
--- 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 0582f6fb1586815c7ab512ad2fe08c934928d251..ba5baf10dc9777eeb0f656f53d85ee73643ae9bd 100644 (file)
--- 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 7a2ac927668f5200c242477bad14cf0119606049..90c901be4fc94326dedcb0eb1f97fe961452970b 100644 (file)
--- 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 6fbeeb23a8e0b803fefb9c86541434042fc983b0..1c4cf990ed52050c847f57ad72e3bcc9089d6a5f 100644 (file)
--- 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 e70a452f15b0b88b4006b34c25cb249aa06c28fd..de89c3f6ce36a0efca3fcd31aebfa9b5f1a8b9c3 100644 (file)
--- 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 b5e18363804480d247182f0ab6d4587bb8375138..b05108cf5fd78534e6ccf98a9474979921c64fdf 100644 (file)
--- 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 d1b8f601b75d708c617b4b7effed4ec388d3c57d..ffc20d0af1e9f4b77d7340673a8a0fb1369515ca 100644 (file)
--- 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 1f22fe0d599de07bb33df79016e6dd06bb850016..36348e4f8f065d302425ae1cdc02db9818cb850a 100644 (file)
--- 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 dcfcd303ac0f8790c76d3958cb886dcf6cf5afad..316e5abe4255bc4a20d877f304ad90a2c2fc3a96 100644 (file)
--- 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 b5c9d73cf5ea29b015fd37ce252a9573e42e5d81..8d656ed8822ba579cee3e702cb8f05aaf5f488a7 100644 (file)
--- 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 86501e32c23b65d98598e294df86279dc8819dfa..890afb7b1c35787d946b9e0aaeb9df1788d79568 100644 (file)
--- 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 7de92304cc8d164babe236d6fb77a609b32e2e80..788ce905add966916aec8842f36e3e247662d06f 100644 (file)
--- 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 e8e8eedd482aa0988d93795e8e3cd21722ccd4ad..0e04da3f863c59195a69c20f789fed50d302a0be 100644 (file)
--- 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 faa1ffad36b9cedf59a4d96b8eb3b2c3283f1216..f0f418958cbd5478016655825960e8347cffaf43 100644 (file)
--- 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 fd07a54edd09f82fd0b60585b79c0a8c5f886df6..4578f0c45c3c5b82c9d9450c81b937a72762abe3 100644 (file)
--- 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 f35ca9f67c2ab8f1f7ac801f301f2ed5a6e69523..621c3a1f425201e62e4b2bb41a7e951c6a6857a0 100644 (file)
--- 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 102f4ceeb4bd68ac6b30bf873c2adc0b431be3b0..a29f750516f2af5bad31af5e3bea00205c85d4ad 100644 (file)
--- 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 9653e807ecf222f3c1feccd56165ee221f7a6c2f..f676cd4a22fd2b4be01552cdc5cc009f2266af6b 100644 (file)
--- 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 36c5c8748adea4743f35769b052219e6c85900f3..523be00eb5d100c68bf2363f09d614667be230c8 100644 (file)
--- 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 fc7c986a62f07617526215c2d608ee52aec930f1..b76286b132a45b7dc4fda7cea70f7bf78322032f 100644 (file)
--- 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 2dbfa9da11daec4e23439fa11c07b1c2f8db91fe..eceba18b6e5a8ada6724339994a5af476fd91fcf 100644 (file)
--- 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 81fc19593b26794438558a2a3a9221d4aa93d688..16d8f9957bc16a92c77c8fe6e5fddf2fd66ad1cd 100644 (file)
--- 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 3c5d5519734617e8210dfca3b7599449069caa25..0452e851de40e19c6c50edbf4a4ccb7c6c07642b 100644 (file)
--- 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 13159ad372ced114dab4b3ea06c93214bfe064c2..55b149cf655d5e94b8b3a3bc41b1bf1003d5e119 100644 (file)
--- 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 e97c8bb41b8b40478ceac27b9a04888af43da9fb..dbcdc7b61f5d570387f397fd1d8930b2396bbd56 100644 (file)
--- 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 edea9c30b0339d392b19ca898fa828e0bb9720a6..f7f85fc464718f229861ffb7c400a4eecbc9d3db 100644 (file)
--- 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 c36031cf8e63ebe50d3c67d4bef9ad042608c525..f895e6c583d448ed2a718c5119e485b62912d59c 100644 (file)
--- 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 3b478c1c93e37bcd387d13433937413b7cde9249..31e631c9957fe067c670ad6898d7592f66beab6f 100644 (file)
--- 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 62249b8ca5d0cfd6344f2971e8441697d24ff9f8..c032548210a1377a916536e1c29dda3136402a45 100644 (file)
--- a/test/confs/0563
+++ b/test/confs/0563
@@ -1,8 +1,10 @@
 # Exim test configuration 0563
 
+exim_path = EXIM_PATH
 tls_advertise_hosts =
 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 d9530e69a8b97e257c129646fb5a22f3f7a10bce..e464f963ce239ad446a4bc8367bd8bc0c6b99082 100644 (file)
--- 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 397536342b0465b07bcdb576b163c750f305df4a..8233e1a79f2adc9cd72329ed3aec174556202452 100644 (file)
--- 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 e4433f8f80e398bb11edfbf086864ccf3e007999..34b36f53d436c3db60aa218846650dd640a1e7dc 100644 (file)
--- 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 e6850b8bd016157c15332b7df2d40c74ba50a008..c23d7da8a01bb7cc3935fad9d491c409ae5b5f45 100644 (file)
--- 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 e6ab3f692c390872bdf78ebb8f749d8956daad2e..b9bf32d73e63ff8e3c1cfdd4fc85b87c5466fe72 100644 (file)
--- 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 eb7218138a4b2e7b55db1728e3372ebcd9a8b60b..0ed683927c7bc844651e56f4fa02188271aa6167 100644 (file)
--- 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/0571 b/test/confs/0571
index 64383cdd816e040f715ce0b9a4c1b19aa705512f..79b816ac7d69f3c65a578b52e6201ddb22f44bed 100644 (file)
--- a/test/confs/0571
+++ b/test/confs/0571
@@ -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/0572 b/test/confs/0572
index f09e52177a1f75a0c5409f5c98413822bc12fdea..9ceeffc8ef64f3ba52a608133da83a03cccb280f 100644 (file)
--- a/test/confs/0572
+++ b/test/confs/0572
@@ -3,6 +3,7 @@
 OPT =
 
 exim_path = EXIM_PATH
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

diff --git a/test/confs/0573 b/test/confs/0573
index c3c7a6bea58763846ef233b116789ee1932f732d..49169756f2c2f43badcdc526bacf9ceff6773f87 100644 (file)
--- a/test/confs/0573
+++ b/test/confs/0573
@@ -1,6 +1,7 @@
 # Exim test configuration 0573
 
 exim_path = EXIM_PATH
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

diff --git a/test/confs/0600 b/test/confs/0600
index 6719259562b448025d0a4d54807622a535233af6..103ecfbaab2d567a253795a870027363fa02e44a 100644 (file)
--- 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 abcaf1c581e93d5343620f2359f5bdd873b7b974..faf44ce9828c9bfb77dcc0a255609a9b480ae4bb 100644 (file)
--- 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
 tls_advertise_hosts =

diff --git a/test/confs/0602 b/test/confs/0602
index 92ab4669c38e171000869c70f651c5dfdc275d35..9048b092c85244f7906c56c4b862eb305ed06837 100644 (file)
--- 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 7709de246621d86d62c35d2c6d558f0b9511d336..44dc866064fcdfe3fccf5f606035b7041cb911e0 100644 (file)
--- 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 3766c330004e174d30dd702e20271f5daa36e14b..80c130cbe08b2f7a330cd3e95b525f3fbfc261a1 100644 (file)
--- 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 44ccb63c7d0a9bce1be1e2688fceefbc739fe544..0c81dea7b327aed5b27bc21f6ee55d9c287908cc 100644 (file)
--- 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 bb94edb29d8fe25f8283c093452a6f681e83703e..b29bf45d3e27fbb1a2c805e3c523ce1f0e47ef74 100644 (file)
--- 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 932ae4c67d9213299b8807ec26e705852f4fb7f5..a8ea019431fd763b9e7c580b7a4bd2f2c998023f 100644 (file)
--- 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 b88f32e12208b844848c7e0a930b44f53aa383ef..17ddc1b14d79d282cc5b3c05b9cddece65a18e1b 100644 (file)
--- 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 2b2f25d2b02fa038989761ba485bdd478efd5892..45eb099d7f2665507b3c53cef20b63bebf647c26 100644 (file)
--- 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/0610 b/test/confs/0610
index 23c5b2cbdbd4b1c340f6b91b78e90eed8dcd98ca..9f1e25307f99ec44b6a34954e6085f13434a19e6 100644 (file)
--- a/test/confs/0610
+++ b/test/confs/0610
@@ -3,6 +3,7 @@
 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/0611 b/test/confs/0611
index b526391987d1416bc755af4d377502b94e2498f9..e8b4c51d40be0cfec5bf7a99275e7df7d1b3696e 100644 (file)
--- a/test/confs/0611
+++ b/test/confs/0611
@@ -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/0612 b/test/confs/0612
index 3439ecb84b32a8f8a28bf3f2a408c9a7cc164016..cac65b1842ea5d487c2890751c6c7d99b23aa895 100644 (file)
--- a/test/confs/0612
+++ b/test/confs/0612
@@ -2,6 +2,7 @@
 # log_defer_output on pipe transport
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

diff --git a/test/confs/0613 b/test/confs/0613
index a5ec4f856ed31b0eee1e1371855f7a962c3a85c4..a2243930a8f6ccf69256c12973c86579c720ba5b 100644 (file)
--- a/test/confs/0613
+++ b/test/confs/0613
@@ -2,6 +2,7 @@
 # manualroute, hosts_randomize and multiple recipients
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

diff --git a/test/confs/0614 b/test/confs/0614
index 2b236174779845745d674f68a1d791a70369dec8..4d90095a781b92bece7e8487d16c6f909ffe7851 100644 (file)
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -2,6 +2,7 @@
 # hosts_connection_nolog versus sender_host lists caching
 
 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 (file)
index 0000000..bbfc497
--- /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 (file)
index 0000000..7962d97
--- /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 b05acde77fe5c79b25435c9ccdaa4ca905f2ad43..59c113d22411b42afca6f25b70669e550fb9a0c9 100644 (file)
--- 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 49d367d7bb70575b922b6bf98644204f96be0f9e..1fc4aaa1189ec496a5269acb398665072fe77b79 100644 (file)
--- 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 8210a10f30d66c586f23471f7344d1bcdedb7029..f39ea1e9ba7f1c014c34ee80e7dcbe675aee2583 100644 (file)
--- 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 386ebb30c51fbec653cfe06d60647db1789e81ed..b000339d8ad5fa0fd4c0d4a0c091d2f2743d2136 100644 (file)
--- 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 d19571b8207cef21125d50f51de4aadd29baf8d4..f3a2b62a26b9bf0dd98da99dfa55c69a539dcc7f 100644 (file)
--- 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 e053d1b096d44649e323fd609ebe5bd63e314e7f..56610fdff96bddadab5efde7802100a581a8412a 100644 (file)
--- 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 2bcd150a9e0f793dd79bc021c1bd0c0c79f2cb6e..7ab9688cc1582a0fc3034bb4ae4511ae03a726f7 100644 (file)
--- 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 cc76315ef177392bbb3b2ab786e3e1adaa99b63f..087ae5aeabbfa659c914b89ec933fb5a4ca6d15f 100644 (file)
--- 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 99b78d9c108f1b3336a4d22d986c2bdad20e1295..a9aa730f4e3fb47013a36927923cf5f8b9fd2633 100644 (file)
--- 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 fde1f7539112e6f28c000a4e5d1f0a978689e8bf..ac4407168c0fe588d6c2c4eaa49fc6cb4d81535e 100644 (file)
--- 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 7a2d34b2f2cfd5a2088f56ab380e299ca3f705df..c34c4f31309e4b298306108b11bd6ef9234c059c 100644 (file)
--- 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 e2572df3a472ee766594ff6113689f8241130757..f1dc480789604dca704bbe06b506ed2012c2c3a0 100644 (file)
--- 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 76e6f1eec0f0dd8a48af2caf2168ee1487f5ec8a..679dccf96c24bf22ab1ea4796f993ccf3a1018b0 100644 (file)
--- 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 8631514b8f2411d6da1af65364033233080ed3a5..17a781911f52459d8fb2a3301fe65e14147ba3cd 100644 (file)
--- 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 2979685ecfc3736b4eb9dd7d9490d8cd96c55496..7fc1ab2615c4ce4149deacc36bf3cae70f493316 100644 (file)
--- 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 5b57b60ffc535a58a2ecd9ccc3eae2686ec45de1..519eb06ab8ebfc5fd8d92285f2d811cf3abb1abb 100644 (file)
--- 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 8c1a13da232a8af5e28e54de677379d2c2b4fdbf..3808ceeb94db52053ca731ca95f7c16b0507b272 100644 (file)
--- 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 5bdf76f03f468662668f5b26b1faad9b7f42eae6..934387512f612754f98005e6a7c60076e6b2bdc1 100644 (file)
--- 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 4bad74a1b3a230e537a3aaaee3f91bd0256a3478..a84ced8a29eade733dfdf81b4683ce048c216c65 100644 (file)
--- 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 66fadea29d4d445bd00f569d7925cfcdba25c3c4..dbc8b871ef93939515cf57a778a29117c9ebea85 100644 (file)
--- 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 34383c25a59b938f13a3ed2a854eab277ebabb43..bc1225fd35d5e5ff76997c696f5f0bf414e397cd 100644 (file)
--- 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 59265d4075c99cc0cb613e9d23c255afc94f15e5..5148a90eac22bccaf52133a8651edd9cdbbab15e 100644 (file)
--- 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 331dd09ef3f50e2bea92900c3e462c9c017785b2..bddd8ac4a05b4c0d5dee0ec39a5ca89ef0ed6a74 100644 (file)
--- 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 562e916fd8e222d426a8c1ae1fda9820a829bf40..f5fc2bb2d6216bfaebbdc05064fb77c7c8094227 100644 (file)
--- 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 734c2834af21bb0967542a75de064fa7744cc339..cdf3e592b93775afb8759191ec1545f1e4f316b1 100644 (file)
--- 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 ef6e14463ff3e828762812b9c2837302b7360f26..c706e2d119ae944cdb3bf806ab70c58793df4665 100644 (file)
--- 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 26b257cd5f3a012d1f522bb6a3f32f9798827ca2..b61fba5873aabc24a109860614683765c8a77c06 100644 (file)
--- 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 4afe33b96067ee585656de563ad852c36fb9832c..6f61f98321a6546b92ccf9f94d34a26a5514999d 100644 (file)
--- 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 798eb73d7d138b2a02e9b495d7f9409c80bed6bf..57c527d30503915e059299e917565e0e7aace85e 100644 (file)
--- 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 7bde464152ce15b98fe0a671bfb0c733a7ffec50..241d88335114284cccc196f398c11bbe26a8a71b 100644 (file)
--- 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 97b98d6ada3197644541d525340b6e988ec26f31..bb80cdd939199e877c434997b3debda3a40f37fd 100644 (file)
--- 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 d11dd5e9eb2710862f375cc9e638668bdb68e796..b4d098c9473152e5951e43bbc2677a81b609048d 100644 (file)
--- 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 8498404041e8788e53120f9d083ca1c6c7db7d1b..e735334d6687f1f2d2b7f482cbccf84501f04abd 100644 (file)
--- 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 43889944450dda5647b393d19ceb11b1258ef69f..9d10d006da83b2847ee52e349468b1bf5d44179f 100644 (file)
--- 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 ccb56dcb29cb7b5d1d4fdf6315fed7878955649e..ac1476b10945ee6641d6e0e05b7bd5316ec12b83 100644 (file)
--- 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 38900bb53a56b604fde91885ef1ce427a52cfc3e..7da11a528625b61a7b4b73be867f33fdf0944038 100644 (file)
--- 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 bd15ea944d6519f7ba9fda61bbedb8e7f7af69b0..6429fec7dbde75fab77aa94bdbd9a6a243c37503 100644 (file)
--- 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 38c14f249d83418066e02eabea51eee710d4e26d..71d708d57e92dcb276a8f882fe2026586a4cac86 100644 (file)
--- 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 b98cf7348b3652580a5326aef7820efdbecf495d..0fdd8e617110c033922d0946731e350450ce48c4 100644 (file)
--- 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 e89e1c99f8d530ed4e6c8dc2ff5a871d837cafcb..80bf30b3e0fcf0e3e73bbe9e49a59ad005d3465b 100644 (file)
--- 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 5791316c1d3bd616820e328f8e33b7c1ad3eb424..d7e140844982ccadb84e02654bbaf575b94efd58 100644 (file)
--- 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 002c31391098eb3b61585f1f1b9df394cbf7a773..0ecd87b44e380ccae2045e7e2d6f51a1c4d180fc 100644 (file)
--- 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 9ed6711721dd5acb77d7e0a5d0c9fce158a6b85a..944c5e7ca0f13f8bd2134f9b52fa8070db867253 100644 (file)
--- 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 dc8ec61acbabea15ad1d87d30692a24352afb9c3..df56723d3fb256af09775899fb5c5b5948dc7fc1 100644 (file)
--- 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 a8de8c06d1b2fb1f8c243543fd26b69882b25f1a..c404caaddcedae850bc86a014f12cc01463154f3 100644 (file)
--- 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 1de92e96296bcea5deef3a93121774c8dc4d56fb..b7893de758e89cfc4d05e5a1b3bd0e0040975c6b 100644 (file)
--- 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 a9bc0ea7fd6308566d5f37e4ac1b2bf2bdf493f0..fc56df40d9c493fcfe9c0ff68af3a1c0e9a28c0c 100644 (file)
--- 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 610a5b722b3b2954ba0ce92c210a56d979a7cc04..8118ef889a0835dce1a81ed942c2858f2f26df54 100644 (file)
--- 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 ec364a3c3335e06a1514d03dde2ac3ec6919e400..1b9444aa57492c14fb7bb80bae3df953a73319d7 100644 (file)
--- 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 d8c685eb545f99188ae92f88e4501cb84475914c..1857f6c94bf35b6aa57facad16b0df39d7505ad9 100644 (file)
--- 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 b1e1967b7a7408be2c09ea5ccadcd18315896c5c..34fb338bc515bb8b5a8e7faaf1bf051f8af8f6bd 100644 (file)
--- 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 0388d0cc685b2095cd9d130ce8260ddd8e1d8e35..a32e7e46ad5b5673f0b856261a8b8b03beb0c39a 100644 (file)
--- 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 3e151936fdc462b87efaf59a0ef6e1b025ff28c4..4987211e12f3334ce4a64c81a0f49c37b7e264f8 100644 (file)
--- 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 db6864863901eae85ebde81959d1e4b185828d5d..045f21d9a43f9eed2ee703065ed0f61ffce6d4f7 100644 (file)
--- 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 9abfc7a1afb233008a4e8bfe2d3bc1942ad43779..d69f2a612558848bf1a2119fe62dba09ce4f2b11 100644 (file)
--- 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 18b2fd780f730487edaca1f738292e765e59ca02..38283826d04b514510221ef27ae749f837a359ac 100644 (file)
--- 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 d9ac5044798fef8e029d2b882768ff268a398549..3ba6bc6203828dd33bef58c9a13ea8e69dca13b5 100644 (file)
--- 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 a2b1c526f775adcd77c673e3ffcbb5ecf1c0fc39..d856e98bc904df76acb1ce9b2e93bf5a83af70d0 100644 (file)
--- 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 8142100aaee5d35a321af0d62f02334e6fab4288..f28f022603a8e045cb56fb0b428a5a63e8996d2f 100644 (file)
--- 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 fbfb6dc5620efd0d26f788a628ea7272a945b94d..b9f3cd8e1cb8eede75e9b669516c3aa0200a4b29 100644 (file)
--- 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 8bf80f2b88d5eea1d100f2a110b82c77cda50c39..8a56c713d139a9429f108da1c25848663eb96295 100644 (file)
--- 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 7ddc16140aebc3ad58dc7affa918000c780be63f..5d2d193f8929414f52d563d63690c51f84522c2c 100644 (file)
--- 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 7d382d9ac6c40de4d325bc6096c31ac35ff46411..f4c2286503a9f300cd687434fe0823d0fa5399c7 100644 (file)
--- 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 c0225e81983be715a47910973c9dd2ffe9a95824..e3a0ba1afef4080c62cf83329326e66d3f5adbfe 100644 (file)
--- 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 c9a28c987bd9611068f85d3de420b174acf1da60..166278f7eafe8d57d0c1a39db046c4068443aab9 100644 (file)
--- 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 510efdaab8592dbbd48d8a0dff1d4fcb388c0054..477812e3c1a73c64549ae394350b267fcadacde1 100644 (file)
--- 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 6170caaa82b9d665d2fd6a3bae56ff0217f03c11..d5da83ef5abeb84fa48a76e489e270565739fa24 100644 (file)
--- 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 930f4b6d56f9fce89cb61cde1ef3fa820e109eb6..2809f6ce9b12171a25b8acb965b53d6d6666c645 100644 (file)
--- 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 20f8e1dfaac0ea31def6c7423f4137d3026c7206..95b3f0d2da1c7600e0dd401688643edde8688f68 100644 (file)
--- 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 3ea1d9c47e63f9e57824c9a67896127a0134b44a..182895a19883ef0d29ceea16942797523b102f6e 100644 (file)
--- 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 786134cae384dbc087f84c88597ae753c3c10ca8..da7d2867f6ba9731e038c2c3cd3ce2a5da1aa33d 100644 (file)
--- 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 3aa44e8cee7fed45cd887ee7b56a4b9041676506..6b43541d5380ce56ee7322c9182609b17d8923a7 100644 (file)
--- 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 6354b7cc32ef908e18eb15e615b458a95ff9764b..6040c1fa64e4afba89f484b3f04ab58fc5811a15 100644 (file)
--- 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 3d83099d10ced09cc4a9d15f6a7e37236f171da9..cb5c4a7145fc7e2f6cacb8924f1a2801aa6db42b 100644 (file)
--- 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 11dc3ce21de42abf22a078bd39ca074d27ef4ee7..804cd749d682e3d25f6a4eeca237297724135290 100644 (file)
--- 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 064a97acff9db006b1cb87e4dbbc9b23ec8b96ed..93ad43f0443284b18e848ac5314cb8cf8ce826e3 100644 (file)
--- 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 1d649e95250ac163df0c835d05956b652648c02b..810ab712a3e802a0f5eea1e41d8eb638cbe2d7ca 100644 (file)
--- 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 3b27f41c94a4cf3c19f4ae57aa56efc8b612722c..50df137fb71c9026b1d46a490c651be4b86c1f6e 100644 (file)
--- 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 c57c8c7966409c8f10f0f78931373703a13ffd46..65919ba8ea945febfd7272ef83e6dfad95bac8a1 100644 (file)
--- a/test/confs/2200
+++ b/test/confs/2200
@@ -2,6 +2,7 @@
 # Check for dnsdb cache TTL handling
 
 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 b60439e29ffbe796b0a542ba4bc1951440691649..c463033fc686a1eefd64f41b707052f8d1c34255 100644 (file)
--- 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 e2cf9d4210824a61482db405e8d4c952ca2f1caf..62272a0ab85c896ca806e028ccac6dfbe62d59e5 100644 (file)
--- 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 96513bd23d5df2896a7f17c362373b9caed0104e..dd097fad8be360bf607ef94cba0967f3608ab8f4 100644 (file)
--- 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 d8bc1b26f3374886af28a5f3fef32c9c5654d28c..018457c7bd2e8433a02bd3ad2c6798b539fe73e8 100644 (file)
--- 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 69ef73c6b977b87d54aa2d17e8b248801875ab95..91915ae1ddaffb33ad709536fe178bbb2dcb8170 100644 (file)
--- 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 1eabf09e4ee497563cfb47892cf08f652380a68e..a4c12adf070a4da300d6e13a5d137be077631c93 100644 (file)
--- 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 655a3712d1ce38836cc80714b60a849c0ee3ebd9..2fd56f1304043cf61f821ab359e051eaf4c782de 100644 (file)
--- 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 c84d54fec9302253614d204a31c3bf67757cbcd1..ea855471ea341259fab87a0018719e6c670b5d21 100644 (file)
--- 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/2700 b/test/confs/2700
index bb001681d511e06ca8236f21fdcd6f7bbb9d5bcd..d6daf0eb2ad39c2145cc95500d69db7df5c6e011 100644 (file)
--- a/test/confs/2700
+++ b/test/confs/2700
@@ -1,6 +1,7 @@
 # Exim test configuration 2700
 
 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 80c6019a137afcec430ec98c347a71bb7c1d25b4..4b41aab70e7a40730179cd9008c8817f3a700317 100644 (file)
--- 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 3eb1148823f1d82c3b1d9639cd39146c409823ae..58ecc663f4746551033d3ad70426281acb42e205 100644 (file)
--- 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 105676976243eb44df28e00d44386dcb162887db..c82c704a31baefe9946bb6951577499fae08f931 100644 (file)
--- 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 478102c3829439b5b25fda03909625e320058c71..337f90a0cc63ac5cb812273acfefd22754941677 100644 (file)
--- 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 b24085c8c2e02a07d55b351a7554683da972e6d2..3c75e2138abbae56c72041ba3c4b324a5562005b 100644 (file)
--- 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 affd4078d9fb2aee6e904777741b69513cae0cae..22f0813a84c1b9f9e9140bf799f24959467171e4 100644 (file)
--- 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 c1574aeb4052a6802d07db22a4b051b64e86a5a9..a7326acdab57a03254f61a2b43f826da961e9c04 100644 (file)
--- 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 c53bca0fda3eaad5110313df7325059b1203acc5..a2e5b4e87bf5123036b97e84eeed1ef36a7b4043 100644 (file)
--- 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 670777b4a01c934a1148de9be8cca35d792dcdef..f4a64bd5e07ea6b2d314ede68b318d85eda19884 100644 (file)
--- 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 ba7446d280d48d61417fee36e7307d40f4a8bb7b..955444086a86c8817a2d1554777e2d6d403b3dcb 100644 (file)
--- 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 015215d8eee9e1f1ec53c6fd3dd7c2127eae486a..1fa360d43ddd3ca38330a925a3ca252271bf1067 100644 (file)
--- 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 d78fcf3c885d524f5d95a7c73b5b6d61003301f1..ebaa4ebddb776a2ae4174addbfa905fda7e41de0 100644 (file)
--- 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 ffd6a1fbb3a37c13d132cf1925797d93a316b240..3478c8aedca0ea786933d06b4e14c276f4b961cb 100644 (file)
--- 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 063cebc45616b39d1d100bac64c02f81b8c63ee3..c179b0a3371f3a57690848d099146ed286f62382 100644 (file)
--- 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 35bf4d38b63d8943f6fe4168c8e6b050acbfc7e8..1627194b37119bc506e3785a99744fe020921c24 100644 (file)
--- 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 5d658e71efed6ea9637174659577e5d9049d0b2c..f80f55d2fc0ca53bb4dbbb57db0481a127100bd4 100644 (file)
--- 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 2dbf0b67fcfbf6f64c497328be5f3b3eedb03109..85e5d75dd410f40c5d22a706d31b61e64aa2ee38 100644 (file)
--- 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 cf896819f97879c959fb8ec6629a059b5578aba8..8496e435b9c6e687dbefc6bd07fc61c9b1a285e8 100644 (file)
--- 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 058e3f55492bc1f96b3adf4680f606448285b0b6..bfb9b37951981a3e277c6174c4f85dfb060029bd 100644 (file)
--- 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 0f35779f0bd0f35b8085d567b1380200f189c7ae..35b45f1a47eabb3f3123686dc6464bca52017308 100644 (file)
--- 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 47827809f951a5afd55fe07c6e72715a78663421..9f62506da58e7e8def39fd320cd3a2327e67ff5e 100644 (file)
--- 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 2a235ed95b86662391bf4f6018eb188925c6f881..b9d07b1cce43b7fe508060f5c696aa8774e6b9e3 100644 (file)
--- 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 90576fc5e88907c9ca3baaad315d6e17680ebc78..f1079ac9342327200fa840359d55e92212a78247 100644 (file)
--- 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 b2515ee56e8bac48bfd09e4437755efe06763e81..fa567ba49facb1b09e54bf41c5135dc2f0705ef4 100644 (file)
--- 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 8d8b50b89b736c0f2f61d0af9bfaf7e4bdb5b96d..ac73900218a17182c3864461c197013fff0a53f5 100644 (file)
--- 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 7a28404c4a6ebbf81126c8855119867ae2b87f7c..e3e9a4b04fcd2a053c52cae25e0df73131c87d02 100644 (file)
--- 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 dd3b8d2ed74200999f1af222a18f13b0cfcaebc4..de59574844a58e6b5fb46ea024692d77bb81a55b 100644 (file)
--- 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 8beadb7f24e543f3da4bb426812247c5c2bb4c29..dc05734b0e3e880617b33ca629759b445c1988f2 100644 (file)
--- 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 3f721d7974fa21f3966f9e6137de1f6f98b17127..2e521db9256da7da36dcd5a07269a62d74cf207d 100644 (file)
--- 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 1bdb9d8e25fcf5427d59d3efe85b189d532ce146..ea9ad6689a589a4d500804d00fc562de37c1f6bb 100644 (file)
--- 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 c0eae20223d48422919f035df665391879ff8fda..bce9cb0fa4bf69a0090bad72994bd21e24a4d4b8 100644 (file)
--- 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 8e0c93c4a2ec99cea38183d4f38919d9cc0fec20..e151e5fbcc28bbfa8ec1bf9ed2ae697ba09b95a3 100644 (file)
--- 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 31503df4895264985b9ec21bc29d4772b9930696..c468d64237d6bdc971cf68ee6cda10b5bc143829 100644 (file)
--- 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 1888371ac404a2e2add81ab3f591dbb12102a554..f76652f95aaae167046a64d304357e5d9357385e 100644 (file)
--- 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 26a277a9874e48f484ef52461aadc9bacdbdf6e0..19e3a6b27a13f2d4d535f3ae9fff2dca2760a270 100644 (file)
--- 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 052469d146e5326c94aa61cb4652c6a4fa5d6ac4..1c0a478cd3ecc85d11fb16eec4bc568e23c1f9c0 100644 (file)
--- 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 6e411f5212ae2c5621e2ee691e946ed42877e4d2..b36e1fa04a12f67c71008d4c75a7a536a03e600d 100644 (file)
--- 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 0a2a068a7079522479febd4db1e260e696788914..199db15907fc5cceb78bb44eeaa2df85eac68c39 100644 (file)
--- 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 727a71d8698cc84f6ad3aea9e88545093472b820..b45b9183c6da7c93db2be7c1bee6ffed5bcddf74 100644 (file)
--- 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 cf7caed4f9fc399fbd150467fcd30f9e1902507c..3d33fb650962be314d0e227699d983f1538223b1 100644 (file)
--- 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 59da15cb8f403dc1eb2e8fbc80d95eed37045941..84e585a5c2e179afbffba2f113f267d117fb37ba 100644 (file)
--- 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 c93abddd76654681a3005cd8012d397bb84f0213..45a28fd62816cb78acc01afabe77c826ad79dedd 100644 (file)
--- 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 f21651e5e923f1d336e764e089485346d2794059..10b6cb952c84654c9cd34742121aa0f3c672713d 100644 (file)
--- 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 1933b8a4866689d1206551732c57ab5f20678c26..f6228f9792f087ff02f1a89c53f918dee3920d52 100644 (file)
--- 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 79f0df297173f1210d2f5e1e7df9a4d396be061d..7f2d2777dfc98e58ff487a61b6a4753a17e89a85 100644 (file)
--- 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 9486f501612f26502abeaefef5c22fa29ff0a3b4..1b73148cc98b46ed31dd294c99241187886e1879 100644 (file)
--- 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 87e57fc889263e79398370678ff9ba01482483b9..fbcd12c9d2d5e8bca7d069b777306ec8fd47f550 100644 (file)
--- 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 a596e8f33437e832fc5434f7398f0a60d93d34c6..690979a2d4d0b080b6cb19c04de856976c6b338f 100644 (file)
--- 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 3e491386bd3b6293478cf9844fb177598a4bd918..7c6549f46c164c76fa692d19096aa6e584cf0a98 100644 (file)
--- 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 1565b5f79fe68f92cb0585e7768b8944362fe5d1..667131e3f385dd85816836aac4a02cf9af3bcc10 100644 (file)
--- 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 f5c2d396171bad994b1e266d988f5a8a8248ac09..bc4ccd8fd0dd9c4834aa870ddf6229edb0b5cb55 100644 (file)
--- 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 61ad4c9270f08659c65e5c1a7b19f03e7cc48eb7..0ab60d1a40d83ddd2e11e3d5f30a93561b0bfc3c 100644 (file)
--- 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 c7d27b811abe03ce789d67f61f38dbbf8b1472b5..a4e7cad7cdd3ede5240920cc6b075dcadea3feb3 100644 (file)
--- 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 380e3a474a9781f8ca069e03a9f726ef1172e990..abfb4aef525eccefe9a89c299ba4e05d25d2d746 100644 (file)
--- 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 be674b502decbeea1d88a21d44318bfd96b8b08e..e489ee93fab122adb0fb1b9c78d1afbfd44fa6f4 100644 (file)
--- 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 cd715d5e630fe54053481707115cc02edbc5a3e1..e7da5a56db6be83f8d1ca453a4c44239ae7750f2 100644 (file)
--- 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 c3d2a31422438a957220d2b0d52db3fcce34edc1..a0b74f1c19a176daf7bb9b25a2260f095217a3ab 100644 (file)
--- 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 f0792722b629b0d92cdc7bf09da5ca9254595dc6..df41eebf714e38e1dc619adbd3f40ecd2c3d9576 100644 (file)
--- 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 463167503265c5f54b685a5032b70c3005758f79..7cba2689f2fbc2e72c05477dcc0564b2f039dde3 100644 (file)
--- 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 8b86f7ed6aefd24ae9e31bfa03d5c52c74331a26..45f95edc228870bec8df1ccba0dbb473c677de51 100644 (file)
--- 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/4010 b/test/confs/4010
index 94dc25b0f339f1b14753e74a317abf47a627180b..62ef3e6ac40cb003d1c7f9d1253cbc946b0afb55 100644 (file)
--- a/test/confs/4010
+++ b/test/confs/4010
@@ -1,6 +1,7 @@
 # Exim test configuration 0568:  ACL regex=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 rfc1413_query_timeout = 0s

diff --git a/test/confs/4020 b/test/confs/4020
index acc44771814e3a299808a57dcccb00ff849bdfd8..d37b0d8fcc75092a3226761d8fccde5f84bfe4a8 100644 (file)
--- a/test/confs/4020
+++ b/test/confs/4020
@@ -3,6 +3,7 @@
 OPT =
 
 exim_path = EXIM_PATH
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

diff --git a/test/confs/4028 b/test/confs/4028
index 3174e7543b5b72c7682bdbc41af1f8d86d75c8bd..de11185bb135c622a078daecd4a50efafae3708f 100644 (file)
--- 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 ae4e71850972adbe2e1c60806e492f8b18aacd9e..b8f7ec45af55863f72ba6b2f41a150661969f984 100644 (file)
--- 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 b5d938321dac9ac5bb95e47b4495ee048a3fec5a..8c101e818475a1163486da1982ec6b7e7c49eb0a 100644 (file)
--- 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 2237b5c993a03dbf26a7e785d3525cd5746c0d26..f7df70b9723a4a3cb44e06990453931758f57f07 100644 (file)
--- 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 980f1d8fa8538ff595701dc20e2615d7925316fb..298eb847d80bb81c10d9df470216f6f11a2299ee 100644 (file)
--- 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 085fecc72cc043a2ddd1ec7e70d8df0baaeb4a31..a5cc47ad1e868db608a215a5b4187794f825e7f1 100644 (file)
--- 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 085fecc72cc043a2ddd1ec7e70d8df0baaeb4a31..a5cc47ad1e868db608a215a5b4187794f825e7f1 100644 (file)
--- 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/4500 b/test/confs/4500
index cb98407cca9db875e8c318f319a1023c1113f55b..61a04f6b0de000c7408898f562a96005fc6e727f 100644 (file)
--- a/test/confs/4500
+++ b/test/confs/4500
@@ -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/4503 b/test/confs/4503
index ccff509dae66bbd2cb645122138390a05f5c2f66..45e6d146379a900440e91ffa1c5fe19d29fb33df 100644 (file)
--- a/test/confs/4503
+++ b/test/confs/4503
@@ -4,6 +4,7 @@ SERVER=
 OPT=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = DIR/spool

diff --git a/test/confs/4700 b/test/confs/4700
index 6a532b6a03721018914c21f3030bc0c394e38df8..5a86785dda7170a56d3142b54b76ac131270d821 100644 (file)
--- a/test/confs/4700
+++ b/test/confs/4700
@@ -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/4800 b/test/confs/4800
index 0fff2b87c34bfa519c1bd7266b7fec9349e492a6..876e81d949b1457b6ca94d856b4e73f3451a87c9 100644 (file)
--- a/test/confs/4800
+++ b/test/confs/4800
@@ -1,4 +1,7 @@
+# exim test configuration 4800
+exim_path = EXIM_PATH
 tls_advertise_hosts =
+keep_environment =
 
 begin routers
   dnslookup:

diff --git a/test/confs/4801 b/test/confs/4801
index 26ac219828b56c13b8dfbe5b4a08a6088eeff7e6..9a09b0289a36536f194b20ea5955c64e1f76a725 100644 (file)
--- a/test/confs/4801
+++ b/test/confs/4801
@@ -1,4 +1,7 @@
+# exim test configuration 4801
+exim_path = EXIM_PATH
 tls_advertise_hosts =
+keep_environment =
 
 begin routers
   dnslookup:

diff --git a/test/confs/4802 b/test/confs/4802
index 0fff2b87c34bfa519c1bd7266b7fec9349e492a6..b37eba738129db57c18f102f850d2c6855c1dfca 100644 (file)
--- a/test/confs/4802
+++ b/test/confs/4802
@@ -1,3 +1,6 @@
+# exim test configuration 4802
+exim_path = EXIM_PATH
+keep_environment =
 tls_advertise_hosts =
 
 begin routers

diff --git a/test/confs/4803 b/test/confs/4803
index c23d89b6e5b4a20f1f61803b83a247dbcd068e80..bb2afffad3cbbf37475fa19daa7e1f1b9157e24a 100644 (file)
--- a/test/confs/4803
+++ b/test/confs/4803
@@ -1,3 +1,6 @@
+# exim test configuration 4803
+exim_path = EXIM_PATH
+keep_environment =
 tls_advertise_hosts =
 dns_trust_aa = *
 

diff --git a/test/confs/4950 b/test/confs/4950
index 752b66aadbe9485917d0d1406e42627beff9a24a..3a1868470a81eb358f73c727f1761956c71579d5 100644 (file)
--- 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 2ceeb06a842108a14c33efbd8479b0f98d219665..7925a61f158ca08ea2e5a0f6d90fac7cbafb19a4 100644 (file)
--- 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 a5475fd859da6ce6a9eb84ced1d4137825e5d590..fbc9f6dc7f8273d55a2255ec2f15caeb8304145d 100644 (file)
--- 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 0211664312ac0f8f2469ba405ed1a4ed5e685853..924e5adf1fd44974bcada219f42981a9f47137cf 100644 (file)
--- 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 cdfaec5dadec3d9271ba4f5824731e1d8b7bc3c5..8c2b6f551d86740476da1b41965fe6378c604346 100644 (file)
--- 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 3596fabaf00f8a84e7bb25a1dc3a4baf00425723..7d4739f10b1dc4831e5dfc612113798d2a51ba29 100644 (file)
--- 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 6fa97f1529410010ee12ad2916a7796df6ff6404..52216ce6936ab4111352ee1a63b306c9c1e0ec2c 100644 (file)
--- 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 107d025dd36a7f64c28f91189e1ff919a2c9b35a..ca45d9b38e93757a43196bdb3b0cb100250371e9 100644 (file)
--- 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 eab0c2013da450e24b64bd3398c2c312b648ad82..435aea650df9e7d87ceed66967927b20d25e3756 100644 (file)
--- 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 adfbecde36bafd4f1c199f548555820d81ebeef1..3e8e5553026342ff1f6127175e2ccdf62caecd0f 100644 (file)
--- 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 f5983a1cb592d0bc537a1e0a7872cf9ae1729766..bc945aa9f74037d5c27d6e2fbfd909740e929ca6 100644 (file)
--- 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 6bff7fe149c3f9232cd9f1c5005a3ef5588b1940..a7d392ecd0761fb6e8a33954b7b370ba623b4c59 100644 (file)
--- 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 908a021a9ea2f98caa3a5b5b2f3244a4761e193c..c3ebee17086981ed8baf3e60b1a9a89959c93915 100644 (file)
--- 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 5de00516cd529b35468501664a09121379edd7ee..bb33142ea16c17d5397bce384edbbe03d55840cd 100644 (file)
--- 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 bc33185c72e001b6aa7ecf9a4ff859fbd9fcd66c..b1341fd32cf77c9b63967f634526a4bf78559871 100644 (file)
--- 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 d9ed330faa5d6166b9bc1d6a4d02bb3ba18886a7..dfd897d55fe8d604f5837978bf93015b945e3a56 100644 (file)
--- 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 a6f70518eabb3f5d0b1e8b31e395196428dad83c..323b473e883c49eda69a4ce7b5ea7102bb7942bc 100644 (file)
--- 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 4fa69d0ceda64d9341a3d48571bef0f197381418..e84e2a3b711c11b9fb1a18bdf9bbbad6e3f3461e 100644 (file)
--- 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 6f5f7e6794c20cc3f316983e44a3f80ecbe16360..5fa1a7702694d357453d21271b730b5023ddab53 100644 (file)
--- 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 99864f5fab12d3e636f420f9e906258bbfc5bc0b..9d348fa7b6642964c4740f1c0f3c478d10924aec 100644 (file)
--- 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 2393a5778fc33d4fcf189895a45b9a7aaa8da390..e44645991f490976bcf9e894ecb835a82ad0becf 100644 (file)
--- 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 fc32d2bdb3d31dcd6f56f40f7db3544a6021fcf1..74bab74e770649fde981291eaf44d96e2f552f7c 100644 (file)
--- 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 4f960659619309b4025e6a1c16243813e98c5ffa..3ef70a42cef2d14eddd68dae0ea65b07db3af1c6 100644 (file)
--- 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 018f1fc7dea35e3e304ca717ac7543a6ec00393a..8b45d32f52e781a83a009dbb40a3f19dc5b86898 100644 (file)
--- 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 5a6276e4638166e69b94a0073643d676aa28e36a..5574fed8e955f5fc6c47a04ce3768a5f1877cb83 100644 (file)
--- 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 334313bb0c00df7c7cbece6106566e04871c0f47..c27e110ba744cf7a211b72974ac8f3fc7d6edd70 100644 (file)
--- 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 e68f9aaff51d992d0d8eff70d0a458e1d80729e8..cda78f89ed9705852f8f2ab399e29a83d1473019 100644 (file)
--- 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 0579db202a4057835a6d2dec9398a5aa98a43062..5ce5eeedbcd0f98385d3d913033a102193db2fce 100644 (file)
--- 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 2a2d4586047b128a16e01acd5ea131b50be2837b..2bbe6965a440063371bd09eb1b47ed366daaec8e 100644 (file)
--- 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 3ee414c85ea90187e8d925801bd712154f8b3b17..2263bc0bf57369263dc4e206ce943e5b5658c2bb 100644 (file)
--- 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 735b529322a6c30263b7aa1ca08464130bea063c..4c59adb95b39f689ebd4673d6d4ae2aac1f0ddf5 100644 (file)
--- 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 f8379c7bda7be4d7c18f7c2a3c839c0cb99db25b..bb559116ece945080fa1c061056e829dda408809 100644 (file)
--- 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 f1a088d42b98f40129349b985ec9f69f3060c8ba..df818af1f4ebf67677cfc6625ae35785fed70cb3 100644 (file)
--- 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 b3bddcd1a6cb1fbce69473f7c8b219ff2fb2abdf..41b424798dcb8514f02570053f211bf83c16327a 100644 (file)
--- 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 2dc1090dfc5ed66689d27fd6575da8737833fe3d..c05bcfcf92e9271b7a5a256955a5d7ffc19fd9fd 100644 (file)
--- 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 785f0c64f3a08339bf2ada5a232d91d8a2d2e8c5..267f4e07135dc8c2982305c66a5d5352cbbca44c 100644 (file)
--- 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/5650 b/test/confs/5650
index bf4462be3a1a4a9e1a2d7ffe753176212486c417..8d07b7a9c94f6f939b6741bd847526a27f080470 100644 (file)
--- 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 cffa4107c2071e03fbc503267181b294b1214e96..fe9d3bcebf24194a70c5977b15597bae134c0f00 100644 (file)
--- 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/5700 b/test/confs/5700
index db1aa2a6e2da109b7b7aa3ef7c0789fbe3efdf5e..613ebef4464a534c91ef123d688c0574b154c1ff 100644 (file)
--- 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/5710 b/test/confs/5710
index 354d3935b22361e1828bc1dc3032f587a3554b82..47c8e7c50a11e1b331c5844528df8976a9e1e973 100644 (file)
--- a/test/confs/5710
+++ b/test/confs/5710
@@ -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/5720 b/test/confs/5720
index e2ef60bdd6ca952b08f48b378bf80c58333fc8c8..ca0b1974459b236a28fd5c53644708f01b2e833c 100644 (file)
--- a/test/confs/5720
+++ b/test/confs/5720
@@ -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/5730 b/test/confs/5730
index 7ed8ad4b7e22bf1fb2aa137e0895562e5a6e47c8..8a5b0751c648abdff571e9332ef91e5137ebab06 100644 (file)
--- a/test/confs/5730
+++ b/test/confs/5730
@@ -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/5740 b/test/confs/5740
index e20a8b6019b3826a155eaa3577646ccb27143a57..4c6345a8a1aac7c6ae43929a9fb6e2d1b7a6090d 100644 (file)
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -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/5800 b/test/confs/5800
index 6d1b1ac5212c136d11bfb687a63da5d975221664..af03ee53a8f8dc04bb634d35c4f249a4685a137d 100644 (file)
--- 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 1b487026faa9d37012fcad99375e6ebfd444b6b0..9ee830910106a578f2eeeaa121688edc1d714820 100644 (file)
--- 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 4f468a3843c9c6e4178ab81e20a3084f0146e346..e83919005e28cf4100e2b31bd84bbfe92c3940ae 100644 (file)
--- 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 d3f6db3c4cf0e3afb9d4d9493bb1386293fb6d59..eae2edb0d634a91f201f67c50a5a565aa0bec946 100644 (file)
--- 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 05512bb0da6b3b6913c6399590c8653c3dc0c7f1..9e9d2b00609f317bdb8fd933a5c36fc9d7569de3 100644 (file)
--- 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 6817dbeb5d282ea507915e47e9d8432f8d91aba6..cd474796fdbab16f06105fd9237ae10fc25082dc 100644 (file)
--- 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 e674784ce5ee554ffa0f4f1cd706b94f1eb6b212..a633b2879e7ef002fbf5e3cb7db6d7820ec6772a 100644 (file)
--- 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 ee4e410309ab77691071c7902c3a42d8298a6a4d..f934e51339213367a104e86b3a8a95ce7695c51f 100644 (file)
--- 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 de32e9bc7d7f2037beaf38485dfe01a2857b9a97..45fb6a8de7700cb620268d1a99d712dcf5981b90 100644 (file)
--- 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 e312ee6096b6c45f7b96375fd3b6f892b696ed8c..f3baf2bbe3300ff214675cbf52e9b191343d3360 100644 (file)
--- 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 855227b3193d960acef174eaf3e9c760f49ba631..0317e853ae6345fab6b418632cd168dd69305bba 100644 (file)
--- 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 b69c844de27ecf398a6029b162ef139f98dfdffa..efa6af29a3d5faff818fe64769ca020954e41cac 100644 (file)
--- 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 7e455d146c14ffb444e13508b10aecaac04383e5..b1aa065da433cb0c6a2eb0c53a894ee1a52b9620 100644 (file)
--- 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 4e2464f4c4547eb0ac71d943cb46a134280838f1..91e0630d3075278c831d42b19424e48126d97c97 100644 (file)
--- 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 7537ebd638c6b2452ed3306cc70d27ad51fb132b..2f55484a769f46a3de6605cb1191005b241581c7 100644 (file)
--- 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 f4c569ff1770284cffdc0fd6bf50dc6c0af6e7c4..3584b71e39b4d1e99cd798ea32fdf2b0f1aa5107 100644 (file)
--- 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 cabbfd5ec76484569854aa7360c493f265fb8efd..95752ec35bfae28f297fa4c986cfb72acfad3ce8 100644 (file)
--- 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 d2f0fcb858e4f9bc3ad47d8e209f3301ab740a4f..200ce25b34725872dae2299af4302bc8699e1942 100644 (file)
--- 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 78e7e579afcdf937baf558573c24786107d54f82..74c607a1bf5ea56e07a1dc90e3f5f6b6495d5ba4 100644 (file)
--- a/test/paniclog/0013
+++ b/test/paniclog/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 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 bf2bfc0b3680e01ca2e2df382682235f9f9a3752..d9985aabdc0b9077e436a9949f5af699a4d6732d 100644 (file)
--- a/test/paniclog/0148
+++ b/test/paniclog/0148
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 17 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 66533fed44eafaefca77d581fd4f21390d7d11a1..6b472bcd885cdd47029f51affe9e12563d9719f4 100644 (file)
--- a/test/paniclog/0236
+++ b/test/paniclog/0236
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 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 24b6854cce2bbdb3d1071ddf2acc9e4a0960718b..40585c690503d9d4dbc7ecc80aefc7c02f87ef7c 100644 (file)
--- a/test/paniclog/0290
+++ b/test/paniclog/0290
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 27 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 d2c59c2adeaa4ac2adca9fa63da2f77ddd4dc023..d18082f4ca07679dba7ffffdec17fb272d58d357 100644 (file)
--- a/test/paniclog/0348
+++ b/test/paniclog/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 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 25 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 25 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 25 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 bedff5d78c90af1b0045841ee52449facc60abbb..4e5fcc9c6f6fb130cf4158471ab10bb4916e18ba 100644 (file)
--- a/test/paniclog/0415
+++ b/test/paniclog/0415
@@ -1,20 +1,20 @@
-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 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 20 of TESTSUITE/test-config:
-  extra characters follow integer value for check_spool_space
 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 22 of TESTSUITE/test-config:
   integer "4000000000.123" is too large (overflow)
-1999-03-02 09:44:33 Exim configuration error in line 21 of TESTSUITE/test-config:
+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 23 of TESTSUITE/test-config:
+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 23 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 23 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 23 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 23 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 23 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 6db126e5a320fff79f4875a5945ccccecb6facdb..f8afd85ea7ba2b3d4ec1655a6058b63057cb49a1 100644 (file)
--- a/test/paniclog/0442
+++ b/test/paniclog/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 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 8dcb0587cd0619fc33232b28e039cecdc7e3bd62..18ed0915d1a29121202a211c6322e4e39b71a51d 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -349,7 +349,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
@@ -564,6 +564,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 ========
 
@@ -1686,6 +1705,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];
@@ -2089,7 +2110,7 @@ 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+-u\s+(\w+))?\s+)?exim(_\S+)?\s+(.*)$/)
+elsif (/^((?i:[A-Z\d_]+=\S+\s+)+)?(\d+)?\s*(sudo(?:\s+-u\s+(\w+))?\s+)?exim(_\S+)?\s+(.*)$/)
   {
   $args = $6;
   my($envset) = (defined $1)? $1      : "";

diff --git a/test/scripts/0000-Basic/0615 b/test/scripts/0000-Basic/0615
new file mode 100644 (file)
index 0000000..9057363
--- /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 (symlink)
index 0000000..122707d
--- /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 b4f06a104862e8d795d750c6559605954dc29128..d94e3686ac476b0eda2203e4508c44dea6694bac 100644 (file)
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -130,6 +130,15 @@ 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")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -189,6 +198,15 @@ 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")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -373,6 +391,15 @@ 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")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+USER in keep_environment? yes (matched "USER")
+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 78e7e579afcdf937baf558573c24786107d54f82..74c607a1bf5ea56e07a1dc90e3f5f6b6495d5ba4 100644 (file)
--- a/test/stderr/0013
+++ b/test/stderr/0013
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 15 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 1b5b73a216d5a109148b4687dc0d1428540261d0..f7153995d7d8665c27b846d5259d547b4bf7c21e 100644 (file)
--- a/test/stderr/0148
+++ b/test/stderr/0148
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 17 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 193370cc85f1c29779b361ff04e0bf45b8e0963d..75ed334bf8c951679494b60d446d9fcdd218a295 100644 (file)
--- a/test/stderr/0236
+++ b/test/stderr/0236
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 15 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 cd1712e9f3cf87b50a3dca89d52e37cf740cb6f1..729780b716ee0e518936f12fa690f044ae36e82c 100644 (file)
--- a/test/stderr/0290
+++ b/test/stderr/0290
@@ -1,3 +1,3 @@
 LOG: PANIC DIE
-  Exim configuration error in line 27 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 d2c59c2adeaa4ac2adca9fa63da2f77ddd4dc023..d18082f4ca07679dba7ffffdec17fb272d58d357 100644 (file)
--- a/test/stderr/0348
+++ b/test/stderr/0348
@@ -1,8 +1,8 @@
-1999-03-02 09:44:33 Exim configuration error in line 25 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 25 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 25 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 25 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 062b67be50c9bca2da7dd1dc709d2b8403d880e5..95b5e7f5ee1baa96afe570d6af4133f868a2aa4e 100644 (file)
--- a/test/stderr/0415
+++ b/test/stderr/0415
@@ -1,30 +1,30 @@
 LOG: PANIC DIE
-  Exim configuration error in line 20 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 20 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 21 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 21 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 23 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 23 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 23 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 23 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 23 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 23 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 6db126e5a320fff79f4875a5945ccccecb6facdb..f8afd85ea7ba2b3d4ec1655a6058b63057cb49a1 100644 (file)
--- a/test/stderr/0442
+++ b/test/stderr/0442
@@ -1,2 +1,2 @@
-1999-03-02 09:44:33 Exim configuration error in line 43 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 (file)
index 0000000..85ee6f7
--- /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/0572 b/test/stdout/0572
index 40397afa515e5f97e3b0d6cd53e703695b91f907..3a026977c039a42552aad7ab076f30c16994da99 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -73,6 +73,7 @@ size_addition = 1024
 # 1 "TESTSUITE/test-config"
 OPT =
 exim_path = TESTSUITE/eximdir/exim
+keep_environment =
 hide host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 spool_directory = TESTSUITE/spool

diff --git a/test/stdout/0615 b/test/stdout/0615
new file mode 100644 (file)
index 0000000..58d5d0e
--- /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 (file)
index 0000000..8ba67bb
--- /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
+