summaryrefslogtreecommitdiffstats
path: root/doc/man5
diff options
context:
space:
mode:
authorRich Salz <rsalz@akamai.com>2021-04-30 12:18:00 -0400
committerTomas Mraz <tomas@openssl.org>2021-05-05 13:11:35 +0200
commitf7050588bc76901e0a147c158e64ac3140dc8bfd (patch)
tree76a0453a8781c5e9ed61553d9086fa0ead7a4bca /doc/man5
parent3fb985fd04611082bbfc3622a078e8c5e5edb378 (diff)
Add .includedir pragma
Also add a negative test, and fix typo's. Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15090)
Diffstat (limited to 'doc/man5')
-rw-r--r--doc/man5/config.pod11
1 files changed, 9 insertions, 2 deletions
diff --git a/doc/man5/config.pod b/doc/man5/config.pod
index 6b800b96e1..ad7d7e1e01 100644
--- a/doc/man5/config.pod
+++ b/doc/man5/config.pod
@@ -48,7 +48,7 @@ while scanning a directory, and that file has an B<.include> directive
that specifies a directory, that is also ignored.
As a general rule, the B<pathname> should be an absolute path; this can
-be enforced with the B<relpath> pragma, described below.
+be enforced with the B<abspath> and B<includedir> pragmas, described below.
The environment variable B<OPENSSL_CONF_INCLUDE>, if it exists,
is prepended to all relative pathnames.
If the pathname is still relative, it is interpreted based on the
@@ -57,7 +57,7 @@ current working directory.
To require all file inclusions to name absolute paths, use the following
directive:
- .progma [=] abspath:value
+ .pragma [=] abspath:value
The default behavior, where the B<value> is B<false> or B<off>, is to allow
relative paths. To require all B<.include> pathnames to be absolute paths,
@@ -76,6 +76,13 @@ C<foo> followed by the expansion of the variable C<bar>. If B<value> is
B<true> or B<on>, then C<foo$bar> is a single seven-character name nad
variable expansions must be specified using braces or parentheses.
+ .pragma [=] includedir:value
+
+If a relative pathname is specified in the B<.include> directive, and
+the B<OPENSSL_CONF_INCLUDE> environment variable doesn't exist, then
+the value of the B<includedir> pragma, if it exists, is prepended to the
+pathname.
+
=head2 Settings
A configuration file is divided into a number of I<sections>. A section