diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/confs/0564 | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/confs/0564')
| -rw-r--r-- | test/confs/0564 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/confs/0564 b/test/confs/0564 index d9530e69a..6a23896ef 100644 --- a/test/confs/0564 +++ b/test/confs/0564 @@ -1,11 +1,13 @@ # 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 gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = tls_advertise_hosts = # ----- Main settings ----- |