From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 21 Jul 2013 16:15:21 +0000 (+0100)
Subject: Merge branch 'master' into transp_logging_1031
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/b1068abad9c5e5f7046caaf632fd2c71ca702020?hp=-c

Merge branch 'master' into transp_logging_1031

Conflicts:
	src/src/readconf.c
---

b1068abad9c5e5f7046caaf632fd2c71ca702020
diff --combined src/src/exim.c
index 3f5e0e153,8ab0456d8..1d3d32723
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@@ -825,9 -825,6 +825,9 @@@ fprintf(f, "Support for:")
  #ifdef EXPERIMENTAL_PRDR
    fprintf(f, " Experimental_PRDR");
  #endif
 +#ifdef EXPERIMENTAL_DBL
 +  fprintf(f, " Experimental_DBL");
 +#endif
  fprintf(f, "\n");
  
  fprintf(f, "Lookups (built-in):");
@@@ -4273,13 -4270,12 +4273,12 @@@ if (msg_action_arg > 0 && msg_action !
    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,