https://bugs.exim.org/show_bug.cgi?id=1971
Git Commit <git@???> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |git@???
--- Comment #4 from Git Commit <git@???> ---
Git commit:
http://git.exim.org/exim.git/commitdiff/33f316f2c5fad1f91b627fce7473da287bb23162
commit 33f316f2c5fad1f91b627fce7473da287bb23162
Author: Heiko Schlittermann (HS12-RIPE) <hs@???>
AuthorDate: Fri Dec 30 14:05:08 2016 +0100
Commit: Heiko Schlittermann (HS12-RIPE) <hs@???>
CommitDate: Fri Dec 30 14:14:20 2016 +0100
Docs: Add .new/wen marker for relative includes (Bug 1971)
---
doc/doc-docbook/spec.xfpt | 11 +++++------
doc/doc-txt/NewStuff | 4 +++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index a2a02df..769b9e1 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -4918,8 +4918,12 @@ using this syntax:
.endd
on a line by itself. Double quotes round the file name are optional. If you
use
the first form, a configuration error occurs if the file does not exist; the
-second form does nothing for non-existent files. In all cases, an absolute
file
+second form does nothing for non-existent files.
+.new
+The first form allows a relative name. It is resolved relative to
+the directory of the including file. For the second form an absolute file
name is required.
+.wen
Includes may be nested to any depth, but remember that Exim reads its
configuration file often, so it is a good idea to keep them to a minimum.
@@ -4937,11 +4941,6 @@ Include processing happens after macro processing (see
below). Its effect is to
process the lines of the included file as if they occurred inline where the
inclusion appears.
-Relative names are allowed with &`.include`&, and are resolved
-relative to the directory of the including file. For security reasons
-this is not allowed with &`.include_if_exists`&. To avoid confusion, it
-is strongly recommended to use absolute names only.
-
.section "Macros in the configuration file" "SECTmacrodefs"
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 9281b36..603351d 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -3,12 +3,14 @@ New Features in Exim
This file contains descriptions of new features that have been added to Exim.
Before a formal release, there may be quite a lot of detail so that people can
-test from the snapshots or the CVS before the documentation is updated. Once
+test from the snapshots or the Git before the documentation is updated. Once
the documentation is updated, this file is reduced to a short list.
Version 4.89
------------
+ 1. Allow relative config file names for ".include"
+
Version 4.88
------------
--
You are receiving this mail because:
You are on the CC list for the bug.
