Remove ACL-config skip so that ${acl } expansions work from queue-runs.

Previously we skipped parsing the ACL section when not needed.  Now it is
potentially needed in all cases.  The skip was ~5% faster than a full parse
so probably not a large part of the exim process startup.

Fix up testsuite output files affected by the removal and add a regression test.

diff --git a/src/src/exim.c b/src/src/exim.c
index a27e391d1b1e40cf98e8706a6c41090c2e845090..8ab0456d83e74d3bf400c957b17bf57d7d862ec6 100644 (file)
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -4270,13 +4270,12 @@ if (msg_action_arg > 0 && msg_action != MSG_DELIVER && msg_action != MSG_LOAD)
   exit(yield);
   }
 
   exit(yield);
   }
 

-/* All the modes below here require the remaining configuration sections
-to be read, except that we can skip over the ACL setting when delivering
-specific messages, or doing a queue run. (For various testing cases we could
-skip too, but as they are rare, it doesn't really matter.) The argument is TRUE
-for skipping. */
+/* We used to set up here to skip reading the ACL section, on
+ (msg_action_arg > 0 || (queue_interval == 0 && !daemon_listen)
+Now, since the intro of the ${acl } expansion, ACL definitions may be
+needed in transports so we lost the optimisation. */

 
 

-readconf_rest(msg_action_arg > 0 || (queue_interval == 0 && !daemon_listen));
+readconf_rest();

 
 /* The configuration data will have been read into POOL_PERM because we won't
 ever want to reset back past it. Change the current pool to POOL_MAIN. In fact,
 
 /* The configuration data will have been read into POOL_PERM because we won't
 ever want to reset back past it. Change the current pool to POOL_MAIN. In fact,

diff --git a/src/src/functions.h b/src/src/functions.h
index e76cd140e294d6e5a3406c5c055d347f6ba63232..d381b569a89c7a3f62412a06feb6c7a58b07c5b3 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -255,7 +255,7 @@ extern void    readconf_print(uschar *, uschar *, BOOL);
 extern uschar *readconf_printtime(int);
 extern uschar *readconf_readname(uschar *, int, uschar *);
 extern int     readconf_readtime(uschar *, int, BOOL);
 extern uschar *readconf_printtime(int);
 extern uschar *readconf_readname(uschar *, int, uschar *);
 extern int     readconf_readtime(uschar *, int, BOOL);

-extern void    readconf_rest(BOOL);
+extern void    readconf_rest();

 extern uschar *readconf_retry_error(uschar *, uschar *, int *, int *);
 extern void    read_message_body(BOOL);
 extern void    receive_bomb_out(uschar *, uschar *);
 extern uschar *readconf_retry_error(uschar *, uschar *, int *, int *);
 extern void    read_message_body(BOOL);
 extern void    receive_bomb_out(uschar *, uschar *);

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 7f42bb7a97179814cdbbe02713459c52b721557d..207b3693d60d1d27cd1ebabed0bbf077d94fd5ef 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3972,27 +3972,15 @@ return acl_line;
 
 /* Now the main function:
 
 
 /* Now the main function:
 

-Arguments:
-  skip        TRUE when this Exim process is doing something that will
-              not need the ACL data
-
+Arguments:    none

 Returns:      nothing
 */
 
 static void
 Returns:      nothing
 */
 
 static void

-readconf_acl(BOOL skip)
+readconf_acl(void)

 {
 uschar *p;
 
 {
 uschar *p;
 

-/* Not receiving messages, don't need to parse the ACL data */
-
-if (skip)
-  {
-  DEBUG(D_acl) debug_printf("skipping ACL configuration - not needed\n");
-  while ((p = get_config_line()) != NULL);
-  return;
-  }
-

 /* Read each ACL and add it into the tree. Macro (re)definitions are allowed
 between ACLs. */
 
 /* Read each ACL and add it into the tree. Macro (re)definitions are allowed
 between ACLs. */
 


@@ -4126,7 +4114,7 @@ while(next_section[0] != 0)
 
   switch(mid)
     {
 
   switch(mid)
     {

-    case 0: readconf_acl(skip_acl); break;
+    case 0: readconf_acl(); break;

     case 1: auths_init(); break;
     case 2: local_scan_init(); break;
     case 3: readconf_retries(); break;
     case 1: auths_init(); break;
     case 2: local_scan_init(); break;
     case 3: readconf_retries(); break;

diff --git a/test/confs/0218 b/test/confs/0218
index a585870ef1bc0bd9d56035004e0dfea25a033bc9..4458e18466500788049fae32eaed33e8c2355357 100644 (file)
--- a/test/confs/0218
+++ b/test/confs/0218
@@ -19,6 +19,13 @@ queue_run_in_order
 queue_only
 
 
 queue_only
 
 

+# ----- ACLs ----
+
+begin acl
+
+expand_check:
+  accept message = ACL
+

 # ----- Routers -----
 
 begin routers
 # ----- Routers -----
 
 begin routers


@@ -30,11 +37,13 @@ bounce:
   data = :fail: just discard
   retry_use_local_part
   senders = :
   data = :fail: just discard
   retry_use_local_part
   senders = :

+  debug_print = R: $router_name  (${acl {expand_check}})

 
 client:
   driver = accept
   retry_use_local_part
   transport = send_to_server
 
 client:
   driver = accept
   retry_use_local_part
   transport = send_to_server

+  debug_print = R: $router_name  (${acl {expand_check}})

 
 
 # ----- Transports -----
 
 
 # ----- Transports -----


@@ -47,6 +56,7 @@ send_to_server:
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S
   command_timeout = 1s
   hosts = 127.0.0.1
   port = PORT_S

+  debug_print = T: $transport_name  (${acl {expand_check}})

 
 
 # ----- Retry -----
 
 
 # ----- Retry -----

diff --git a/test/stderr/0021 b/test/stderr/0021
index 4f43e05c92f22a4c2e4addb3099492eaca6e0500..64c72d2bff0d39da89792f803623b916a2de5d73 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -176,7 +176,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-skipping ACL configuration - not needed

 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile
 x in "!bad"? yes (end of list)
 LOG: MAIN
   => x <x@y> R=accept T=appendfile

diff --git a/test/stderr/0218 b/test/stderr/0218
index 67ae81ee605617885b32110186abf444281e3f03..bf017625609ca6296fd137c6324f6d7ced7f651a 100644 (file)
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -6,9 +6,15 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
 queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)
   Start queue run: pid=pppp -qq
 queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 delivering 10HmaY-0005vi-00 (queue run pid ppppp)
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)
 queue running combined directories
 delivering 10HmaX-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex


@@ -31,6 +37,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)
 trusted user
 admin user
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<b@test.ex>
   SMTP>> DATA
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<b@test.ex>
   SMTP>> DATA


@@ -56,9 +64,15 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
 queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
   Start queue run: pid=pppp -qq
 queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)
 queue running combined directories
 delivering 10HmaZ-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex


@@ -83,6 +97,8 @@ LOG: MAIN
 LOG: MAIN
   Completed
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 LOG: MAIN
   Completed
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   127.0.0.1 [127.0.0.1] Connection refused
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   127.0.0.1 [127.0.0.1] Connection refused


@@ -97,7 +113,10 @@ admin user
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qqf
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 delivering 10HmbB-0005vi-00 (queue run pid ppppp)
 delivering 10HmbB-0005vi-00 (queue run pid ppppp)

+R: bounce  (ACL)

 LOG: MAIN
   ** CALLER@test.ex F=<> R=bounce: just discard
 LOG: MAIN
 LOG: MAIN
   ** CALLER@test.ex F=<> R=bounce: just discard
 LOG: MAIN


@@ -105,7 +124,11 @@ LOG: MAIN
 LOG: MAIN
   Completed
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
 LOG: MAIN
   Completed
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 delivering 10HmbA-0005vi-00 (queue run pid ppppp)
 delivering 10HmbA-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex


@@ -135,6 +158,8 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
 trusted user
 admin user
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)

+R: client  (ACL)
+T: send_to_server  (ACL)

   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<c@test.ex>
   SMTP>> DATA
   SMTP>> MAIL FROM:<CALLER@test.ex>
   SMTP>> RCPT TO:<c@test.ex>
   SMTP>> DATA

diff --git a/test/stderr/2600 b/test/stderr/2600
index 2df984486624f1e5052f6f7f371fe6cf0a85c0bb..57026026d4471df8e695e9c4cff1a6d0e89fafcd 100644 (file)
--- a/test/stderr/2600
+++ b/test/stderr/2600
@@ -319,7 +319,6 @@ changed uid/gid: forcing real = effective
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-skipping ACL configuration - not needed

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 set_process_info: pppp delivering specified messages

diff --git a/test/stderr/5400 b/test/stderr/5400
index bc3dba5ddb738dc21f95e852c4424dcdefd587ed..73934dd920a1a7aa95464d31fe10bca40344cd6c 100644 (file)
--- a/test/stderr/5400
+++ b/test/stderr/5400
@@ -125,7 +125,6 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

-skipping ACL configuration - not needed

 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> usery@domain.com <--------
 smtp transport entered
 >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>>
 --------> usery@domain.com <--------
 smtp transport entered