Fix $mime_part_count for non-mime message on multi-message connection. Bug 2537

5 files changed, 123 insertions, 61 deletions

diff --git a/test/confs/4001 b/test/confs/4001
index cf124eccf..856beb1ca 100644
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,53 +1,25 @@
-# Exim test configuration 4001:  ACL regex=
+# Exim test configuration 4001: multiple messages in connection
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-
+queue_only
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = check_rcpt
-acl_smtp_data = check_data
-acl_not_smtp  = check_data
-
+acl_smtp_rcpt = accept
+acl_smtp_mime = check_mime
+acl_smtp_data =	check_data
 
 # ----- ACL -----
 
 begin acl
 
-check_rcpt:
-  accept
+check_mime:
+  accept	decode  = default
+		logwrite = mime_acl: mime_part_count $mime_part_count
 
 check_data:
-  warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
-           message = X-Regex: Regex matched <$regex1> <$regex3>
-
-  warn     condition = ${if !eq{$h_fakereject:}{}}
-           control   = fakereject
-
-  warn     condition = ${if !eq{$h_fakedefer:}{}}
-           control   = fakedefer
-
-  accept
-
-# ----- Routers -----
-
-begin routers
-
-r1:
-  driver = accept
-  transport = t1
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
-  user = CALLER
-
+  accept	logwrite = mime_acl: mime_part_count $mime_part_count
 
 # End
diff --git a/test/confs/4002 b/test/confs/4002
index 043a1eccb..cf124eccf 100644
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -1,38 +1,53 @@
-# Exim test configuration 4002
-# Content-scan: spamassassin interface
-
-OPT= 127.0.0.1 7833
+# Exim test configuration 4001:  ACL regex=
 
 .include DIR/aux-var/std_conf_prefix
 
-log_selector = +subject
 primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
 
-# we need to set the sender
-trusted_users = CALLER
-
-spamd_address = OPT
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept
-acl_smtp_data = c_data
+acl_smtp_rcpt = check_rcpt
+acl_smtp_data = check_data
+acl_not_smtp  = check_data
+
+
+# ----- ACL -----
 
 begin acl
 
-c_data:
-  warn
-    spam = nobody
-  warn
-    log_message = $callout_address $spam_action $spam_report
+check_rcpt:
+  accept
+
+check_data:
+  warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
+           message = X-Regex: Regex matched <$regex1> <$regex3>
+
+  warn     condition = ${if !eq{$h_fakereject:}{}}
+           control   = fakereject
+
+  warn     condition = ${if !eq{$h_fakedefer:}{}}
+           control   = fakedefer
+
   accept
 
 # ----- Routers -----
 
 begin routers
 
-r:
-  driver = redirect
-  data = :blackhole:
+r1:
+  driver = accept
+  transport = t1
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = DIR/test-mail/${bless:$local_part}
+  user = CALLER
+
 
 # End
diff --git a/test/confs/4003 b/test/confs/4003
index 1d00cc695..043a1eccb 100644
--- a/test/confs/4003
+++ b/test/confs/4003
@@ -1,12 +1,17 @@
-# Exim test configuration 4003
-# Content-scan: rspamd interface
+# Exim test configuration 4002
+# Content-scan: spamassassin interface
+
+OPT= 127.0.0.1 7833
 
 .include DIR/aux-var/std_conf_prefix
 
 log_selector = +subject
 primary_hostname = myhost.test.ex
 
-spamd_address = 127.0.0.1 11333 variant=rspamd
+# we need to set the sender
+trusted_users = CALLER
+
+spamd_address = OPT
 
 # ----- Main settings -----
 
@@ -19,7 +24,7 @@ c_data:
   warn
     spam = nobody
   warn
-    log_message = $spam_action $spam_report
+    log_message = $callout_address $spam_action $spam_report
   accept
 
 # ----- Routers -----
diff --git a/test/confs/4004 b/test/confs/4004
new file mode 100644
index 000000000..1d00cc695
--- /dev/null
+++ b/test/confs/4004
@@ -0,0 +1,33 @@
+# Exim test configuration 4003
+# Content-scan: rspamd interface
+
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +subject
+primary_hostname = myhost.test.ex
+
+spamd_address = 127.0.0.1 11333 variant=rspamd
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_data = c_data
+
+begin acl
+
+c_data:
+  warn
+    spam = nobody
+  warn
+    log_message = $spam_action $spam_report
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+r:
+  driver = redirect
+  data = :blackhole:
+
+# End
diff --git a/test/confs/4015 b/test/confs/4015
index 4a5de2315..043a1eccb 120000..100644
--- a/test/confs/4015
+++ b/test/confs/4015
@@ -1 +1,38 @@
-4002
\ No newline at end of file
+# Exim test configuration 4002
+# Content-scan: spamassassin interface
+
+OPT= 127.0.0.1 7833
+
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +subject
+primary_hostname = myhost.test.ex
+
+# we need to set the sender
+trusted_users = CALLER
+
+spamd_address = OPT
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+acl_smtp_data = c_data
+
+begin acl
+
+c_data:
+  warn
+    spam = nobody
+  warn
+    log_message = $callout_address $spam_action $spam_report
+  accept
+
+# ----- Routers -----
+
+begin routers
+
+r:
+  driver = redirect
+  data = :blackhole:
+
+# End