GnuTLS: clear errno before any data i/o op, so error logging does not see stale values

[exim.git] / test / confs / 0096

diff --git a/test/confs/0096 b/test/confs/0096
index 1ee9b746f424937002f99f149b6f43f79146e31e..1eb519417f56e26a0968f648d74126421ba30c07 100644 (file)
--- a/test/confs/0096
+++ b/test/confs/0096
@@ -1,12 +1,7 @@
 # Exim test configuration 0096
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -21,7 +16,8 @@ localuser:
   driver = accept
   local_parts = userx
   headers_add = "${if def:h_x-rbl-warning: {Added: xxxx}fail}"
-  headers_remove = "${if def:h_x-rbl-warning: {subject}fail}"
+  # Colon-sep list!
+  headers_remove = "${if def::h_x-rbl-warning:: {subject}fail}"
   transport = local_delivery
 
 
@@ -33,7 +29,7 @@ local_delivery:
   driver = appendfile
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   return_path_add
   user = CALLER