Merge branch 'multiqueue_336': Named queues

diff --cc doc/doc-docbook/spec.xfpt
Simple merge

diff --cc doc/doc-txt/NewStuff
index 90aefc4fe8dbdbd514fb65a455850e2ffe4ba84d,7cc6ace3973270c994d3132b9cc04d09c5f75673..2a776b7305bccde69e4d1c67a11d894695de1cd6
--- 1/doc/doc-txt/NewStuff
--- 2/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@@ -9,18 -9,14 +9,23 @@@ the documentation is updated, this fil
  Version 4.88
  ------------
  
 - 1. The new perl_tainmode option allows to run the embedded perl
 + 1. The new perl_taintmode option allows to run the embedded perl
      interpreter in taint mode.
  
 - 2. Facility for named queues:  A commandline argument can specify
 + 2. New log_selector: dnssec, adds a "DS" tag to acceptance and delivery lines.
 +
 + 3. Speculative debugging, via a "kill" option to the "control=debug" ACL
 +    modifier.
 +
 + 4. New expansion item ${sha3:<string>} / ${sha3_<N>:<string>}.
 +    N can be 224, 256 (default), 384, 512.
 +    With GnuTLS 3.5.0 or later, only.
 +
++ 5. Facility for named queues:  A commandline argument can specify
+     the queue name for a queue operation, and an ACL modifier can set
+     the queue to be used for a message.  A $queue_name variable gives
+     visibility.
+ 
  
  Version 4.87
  ------------

diff --cc src/OS/Makefile-Base
Simple merge

diff --cc src/src/acl.c
Simple merge

diff --cc src/src/deliver.c
Simple merge

diff --cc src/src/exim.c
Simple merge

diff --cc src/src/expand.c
Simple merge

diff --cc src/src/functions.h
Simple merge

diff --cc src/src/globals.c
Simple merge

diff --cc src/src/globals.h
Simple merge

diff --cc src/src/readconf.c
Simple merge

diff --cc src/src/receive.c
Simple merge

diff --cc src/src/smtp_in.c
Simple merge

diff --cc test/runtest
index 3403d78de314bdc463ecf14380cf9b8d8cb689be,fb93d8de37bd30c7d4c78f6f298f0b506590c318..6cb90fb7db0c91fdb94fc1e7d44fd07bde572918
--- 1/test/runtest
--- 2/test/runtest
+++ b/test/runtest
@@@ -653,6 -653,6 +653,9 @@@ RESET_AFTER_EXTRA_LINE_READ
    s/waiting for children of \d+/waiting for children of pppp/;
    s/waiting for (\S+) \(\d+\)/waiting for $1 (pppp)/;
  
++  # The spool header file name varies with PID
++  s%^(Writing spool header file: .*/hdr).[0-9]{1,5}%$1.pppp%;
++
    # ======== Port numbers ========
    # Incoming port numbers may vary, but not in daemon startup line.
  

diff --cc test/stderr/0575
index 4c1a4c0990f599981879103b1f0ee3cfb7ba6388,0000000000000000000000000000000000000000..fb8282a6a6c02614538f8630394b32c477cf6f3c
mode 100644,000000..100644
--- 1/test/stderr/0575
--- /dev/null
+++ b/test/stderr/0575
@@@ -1,60 -1,0 +1,61 @@@
 +Exim version x.yz ....
 +changed uid/gid: forcing real = effective
 +  uid=uuuu gid=CALLER_GID pid=pppp
 +configuration file is TESTSUITE/test-config
 +admin user
 +changed uid/gid: privilege not needed
 +  uid=EXIM_UID gid=EXIM_GID pid=pppp
 +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 +sender address = CALLER@test.ex
 +sender_fullhost = [V4NET.0.0.0]
 +sender_rcvhost = [V4NET.0.0.0]
 +host in hosts_connection_nolog? no (option unset)
 +LOG: smtp_connection MAIN
 +  SMTP connection from [V4NET.0.0.0]
 +host in host_lookup? no (option unset)
 +set_process_info: pppp handling incoming connection from [V4NET.0.0.0]
 +host in host_reject_connection? no (option unset)
 +host in sender_unqualified_hosts? no (option unset)
 +host in recipient_unqualified_hosts? no (option unset)
 +host in helo_verify_hosts? no (option unset)
 +host in helo_try_verify_hosts? no (option unset)
 +host in helo_accept_junk_hosts? no (option unset)
 +SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 +smtp_setup_msg entered
 +SMTP<< mail from:<x@y>
 +SMTP>> 250 OK
 +SMTP<< rcpt to:<x@y>
 +processing "accept"
 +accept: condition test succeeded in inline ACL
 +end of inline ACL: ACCEPT
 +SMTP>> 250 Accepted
 +DSN: orcpt: NULL  flags: 0
 +SMTP<< data
 +SMTP>> 354 Enter message, ending with "." on a line by itself
 +search_tidyup called
 +host in ignore_fromline_hosts? no (option unset)
 +>>Headers received:
 +
 +search_tidyup called
 +>>Headers after rewriting and local additions:
 +
++Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 +Data file written for message 10HmaX-0005vi-00
 +>>Generated Received: header line
 +P Received: from [V4NET.0.0.0]
 +      by mail.test.ex with smtp (Exim x.yz)
 +      (envelope-from <x@y>)
 +      id 10HmaX-0005vi-00
 +      for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 +calling local_scan(); timeout=300
 +local_scan() returned 0 NULL
 +LOG: MAIN
 +  <= x@y H=[V4NET.0.0.0] P=smtp S=sss
 +SMTP>> 250 OK id=10HmaX-0005vi-00
 +smtp_setup_msg entered
 +SMTP<< quit
 +SMTP>> 221 mail.test.ex closing connection
 +LOG: smtp_connection MAIN
 +  SMTP connection from [V4NET.0.0.0] closed by QUIT
 +search_tidyup called
 +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>

diff --cc test/stdout/0574
index 8b960505dbf3cd50469bf85500e76b1bca5c64b5,0000000000000000000000000000000000000000..aea0754b746d0a0f532231ce7a11077718a97831
mode 100644,000000..100644
--- 1/test/stdout/0574
--- /dev/null
+++ b/test/stdout/0574
@@@ -1,60 -1,0 +1,61 @@@
- Writing spool header file
 +Connecting to 127.0.0.1 port 1225 ... connected
 +??? 220
 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 +>>> EHLO test.ex
 +??? 250-
 +<<< 250-myhost.test.ex Hello test.ex [127.0.0.1]
 +??? 250-
 +<<< 250-SIZE 52428800
 +??? 250-
 +<<< 250-8BITMIME
 +??? 250-
 +<<< 250-PIPELINING
 +??? 250 
 +<<< 250 HELP
 +>>> MAIL FROM:<tester@test.ex>
 +??? 250
 +<<< 250 OK
 +>>> RCPT TO:<dest@test.ex>
 +??? 250
 +<<< 250 Accepted
 +>>> DATA
 +??? 354
 +<<< 354 Enter message, ending with "." on a line by itself
 +>>> Subject: test
 +>>> 
 +>>> body
 +>>> .
 +??? 250
 +<<< 250 OK id=10HmaX-0005vi-00
 +>>> QUIT
 +??? 221
 +<<< 221 myhost.test.ex closing connection
 +End of script
 +accept: condition test succeeded in ACL "chk_data"
 +end of ACL "chk_data": ACCEPT
 +calling local_scan(); timeout=300
 +local_scan() returned 0 NULL
 +considering: ${tod_full}
 +  expanding: ${tod_full}
 +     result: Tue, 2 Mar 1999 09:44:33 +0000
++Writing spool header file: TESTSUITE/spool//input//hdr.pppp
 +DSN: Write SPOOL :-dsn_envid NULL
 +DSN: Write SPOOL :-dsn_ret 0
 +DSN: Flags :0
 +DSN: **** SPOOL_OUT - address: |dest@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0
++Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
 +Size of headers = sss
 +LOG: MAIN
 +  <= tester@test.ex H=(test.ex) [127.0.0.1] P=esmtp S=sss
 +SMTP>> 250 OK id=10HmaX-0005vi-00
 +search_tidyup called
 +Sender: tester@test.ex
 +Recipients:
 +  dest@test.ex
 +Process pppp is ready for new message
 +smtp_setup_msg entered
 +SMTP<< QUIT
 +SMTP>> 221 myhost.test.ex closing connection
 +LOG: smtp_connection MAIN
 +  SMTP connection from (test.ex) [127.0.0.1] closed by QUIT
 +search_tidyup called