DANE: fix TA-mode verify under GnuTLS. Bug 2311

[exim.git] / test / confs / 4560

diff --git a/test/confs/4560 b/test/confs/4560
index 1012a38970af15b9575414b5783f52a6dde923b7..5dda8244c8f84be203bea03df647e4bfbe0a6487 100644 (file)
--- a/test/confs/4560
+++ b/test/confs/4560
@@ -1,6 +1,8 @@
 # Exim test configuration 4560
 
 SERVER=
 # Exim test configuration 4560
 
 SERVER=

+VALUE=
+INSERT=

 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 


@@ -18,7 +20,13 @@ queue_only
 begin acl
 
 check_data:
 begin acl
 
 check_data:

-  warn !verify =       arc
+  warn !verify =       arc VALUE
+       INSERT
+
+  warn logwrite =      arc_state: <$arc_state>
+       condition =     ${if def:arc_state_reason}
+       logwrite =      reason:    <$arc_state_reason>
+

 .ifdef OPTION
   accept
 .else
 .ifdef OPTION
   accept
 .else


@@ -64,16 +72,20 @@ tfile:
 
 tsmtp:
   driver =     smtp
 
 tsmtp:
   driver =     smtp

-  hosts =      HOSTIPV4
+  hosts =      127.0.0.1

   port =       PORT_D
   allow_localhost
 .ifndef OPTION
   port =       PORT_D
   allow_localhost
 .ifndef OPTION

+.ifdef BAD
+  arc_sign =   $primary_hostname : sel : MISSING_KEY
+.else

   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif
   arc_sign =   $primary_hostname : sel : DIR/aux-fixed/dkim/dkim.private
 .endif

+.endif

 
 tmlist:
   driver =     smtp
 
 tmlist:
   driver =     smtp

-  hosts =      HOSTIPV4
+  hosts =      127.0.0.1

   port =       PORT_D
   allow_localhost
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter
   port =       PORT_D
   allow_localhost
   transport_filter =   /bin/cat - DIR/aux-fixed/TESTNUM.mlistfooter