git://git.exim.org
/
users
/
jgh
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove ACL-config skip so that ${acl } expansions work from queue-runs.
[users/jgh/exim.git]
/
src
/
src
/
readconf.c
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;