Testsuite: fix macro conflict (X vs. HEADERS_MAXSIZE)

diff --git a/test/confs/0900 b/test/confs/0900
index 4c5824545c4b826c0c06becbeaea3031d3527fd6..2eaf01ee3e661070ff9518388be7eba3ee037bbe 100644 (file)
--- a/test/confs/0900
+++ b/test/confs/0900
@@ -1,7 +1,7 @@
 # Exim test configuration 0900
 SERVER=
 Y=
 # Exim test configuration 0900
 SERVER=
 Y=

-OPT=
+LIST=

 ALLOW=
 
 exim_path = EXIM_PATH
 ALLOW=
 
 exim_path = EXIM_PATH


@@ -58,7 +58,7 @@ begin routers
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}
 to_server:
   driver = accept
   condition =  ${if !eq {SERVER}{server}}

-  transport =  remote_smtp${if eq {X}{dkim} {_dkim}}
+  transport =  remote_smtp${if eq {OPT}{dkim} {_dkim}}

   errors_to =  ""
 
 fail_remote_domains:
   errors_to =  ""
 
 fail_remote_domains:


@@ -103,12 +103,12 @@ remote_smtp_dkim:
   command_timeout = 2s
   final_timeout = 2s
 
   command_timeout = 2s
   final_timeout = 2s
 

-.ifdef X
+.ifdef OPT

   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE
   dkim_domain =                test.ex
   dkim_selector =      sel
   dkim_private_key =   DIR/aux-fixed/dkim/dkim.private
 .ifndef HEADERS_MAXSIZE

-  dkim_sign_headers =  OPT
+  dkim_sign_headers =  LIST

 .endif
 .endif
 
 .endif
 .endif
 

diff --git a/test/log/4509 b/test/log/4509
index 755a1ec4eb195cce7e5e8d7a0fad36d383f32aef..6a222d0b4aca9eb306f32f84234b94688df83512 100644 (file)
--- a/test/log/4509
+++ b/test/log/4509
@@ -1,8 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for a@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for a@test.ex

-1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 988 byte chunk, total 988\\n250 OK id=10HmaY-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 665 byte chunk, total 665\\n250 OK id=10HmaY-0005vi-00"

 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for b@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@testhost.test.ex U=CALLER P=local S=sss for b@test.ex

-1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8524 byte chunk, total 9175\\n250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => b@test.ex R=to_server T=remote_smtp_dkim H=127.0.0.1 [127.0.0.1] K C="250- 8524 byte chunk, total 8852\\n250 OK id=10HmbA-0005vi-00"

 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 
 ******** SERVER ********
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 
 ******** SERVER ********

diff --git a/test/scripts/4500-Domain-Keys-Identified-Mail/4509 b/test/scripts/4500-Domain-Keys-Identified-Mail/4509
index 9e47901728dbfd4123e0cbae6e441aeb35581644..9433815df9f40549629e70199961699fb7760baf 100644 (file)
--- a/test/scripts/4500-Domain-Keys-Identified-Mail/4509
+++ b/test/scripts/4500-Domain-Keys-Identified-Mail/4509
@@ -4,7 +4,7 @@ exim -bd -DSERVER=server -oX PORT_S
 ****
 #
 # single header signed, short message
 ****
 #
 # single header signed, short message

-exim -DX=dkim -DOPT=From -odf a@test.ex
+exim -DOPT=dkim -DLIST=From -odf a@test.ex

 From: nobody@example.com
 From: second@example.com
 
 From: nobody@example.com
 From: second@example.com
 


@@ -12,7 +12,7 @@ content
 ****
 #
 # single header signed, long message
 ****
 #
 # single header signed, long message

-exim -DX=dkim -DOPT=From -odf b@test.ex
+exim -DOPT=dkim -DLIST=From -odf b@test.ex

 From: nobody@example.com
 From: second@example.com
 
 From: nobody@example.com
 From: second@example.com