From: Jeremy Harris Date: Fri, 3 Jun 2016 14:50:00 +0000 (+0100) Subject: Merge branch 'multiqueue_336': Named queues X-Git-Tag: exim-4_88_RC1~84 X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=e498ab40197936833f696439e78c5cb08e5180cb Merge branch 'multiqueue_336': Named queues --- e498ab40197936833f696439e78c5cb08e5180cb diff --cc doc/doc-txt/NewStuff index 90aefc4fe,7cc6ace39..2a776b730 --- a/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:} / ${sha3_:}. + 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 test/runtest index 3403d78de,fb93d8de3..6cb90fb7d --- a/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 4c1a4c099,000000000..fb8282a6a mode 100644,000000..100644 --- a/test/stderr/0575 +++ 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: +SMTP>> 250 OK +SMTP<< rcpt to: +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 ) + 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 8b960505d,000000000..aea0754b7 mode 100644,000000..100644 --- a/test/stdout/0574 +++ b/test/stdout/0574 @@@ -1,60 -1,0 +1,61 @@@ +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: +??? 250 +<<< 250 OK +>>> RCPT TO: +??? 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 ++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