On 2010-12-19 David Woodhouse <dwmw2@???> wrote:
> On Sat, 2010-12-18 at 19:23 +0100, Andreas Metzler wrote:
> > Afaiui the format of TRUSTED_CONFIG_LIST one filename per line (not a colon
> > separated list). I do not think the documentation (spec.xfpt) says
> > this. Could you clarify this?
> Useful criticism; thanks. More useful if it were in 'diff -u' form
> though :)
[...]
There are two files in GIT head that refer to TRUSTED_CONFIG_LIST instead
of TRUSTED_CONFIG_PREFIX_FILE. Patch attached. ;-)
cu andreas
From cb3852e0ebb470e409fd3ee953c8fec67eace109 Mon Sep 17 00:00:00 2001
From: Andreas Metzler <eximusers@???>
Date: Tue, 21 Dec 2010 15:40:42 +0100
Subject: [PATCH] Do not refer to TRUSTED_CONFIG_PREFIX_FILE.
Refer to TRUSTED_CONFIG_LIST instead of TRUSTED_CONFIG_PREFIX_FILE in
documentation and comments.
---
doc/doc-src/FAQ.src | 4 ++--
src/src/EDITME | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/doc-src/FAQ.src b/doc/doc-src/FAQ.src
index 461b1a6..a132911 100644
--- a/doc/doc-src/FAQ.src
+++ b/doc/doc-src/FAQ.src
@@ -851,7 +851,7 @@ A0044: Exim has been unable to create a file in its spool area in which to
If you are running Exim with an alternate configuration file using a
command such as \"exim -C altconfig..."\, remember that the use of -C
- takes away Exim's root privilege, unless \\TRUSTED_CONFIG_PREFIX_FILE\\
+ takes away Exim's root privilege, unless \\TRUSTED_CONFIG_LIST\\
is set in \(Local/Makefile)\ and the corresponding file contains a
prefix which matches the alternative configuration file being used.
@@ -1155,7 +1155,7 @@ A0065: When Exim is called with -C, it passes on -C to any instances of itself
includes the case where Exim re-execs itself to regain root privilege.
Thus it can't write to the spool.
- The fix for this is to use the \\TRUSTED_CONFIG_PREFIX_LIST\\ build-time
+ The fix for this is to use the \\TRUSTED_CONFIG_LIST\\ build-time
option. This defines a file containing a list of 'trusted' prefixes for
configuration files. Any configuration file specified with -C, if it
matches a prefix listed in that file, will be used without dropping root
diff --git a/src/src/EDITME b/src/src/EDITME
index 1bb60be..3c162c9 100644
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -498,7 +498,7 @@ FIXED_NEVER_USERS=root
# to override values with -D and assumes that these will be passed through to
# the delivery processes. As of Exim 4.73, this is no longer the case by
# default. Going forward, we strongly recommend that you use a shim Exim
-# configuration file owned by root stored under TRUSTED_CONFIG_PREFIX_LIST.
+# configuration file owned by root stored under TRUSTED_CONFIG_LIST.
# That shim can set macros before .include'ing your main configuration file.
#
# As a strictly transient measure to ease migration to 4.73, the
--
1.7.2.3
