New variable $exim_version. Bug 306

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 8ef56d1e3bbb7d717f9e38ff696b65ee59eedc61..1486b005c6662eddf51f9671ce3818f68ee5ce43 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -11372,6 +11372,13 @@ This variable contains the path to the Exim binary.
 .vindex "&$exim_uid$&"
 This variable contains the numerical value of the Exim user id.
 
 .vindex "&$exim_uid$&"
 This variable contains the numerical value of the Exim user id.
 

+.vitem &$exim_version$&
+.vindex "&$exim_uid$&"
+This variable contains the version string of the Exim build.
+The first character is a major version number, currently 4.
+Then after a dot, the next group of digits is a minor version number.
+There may be other characters following the minor version.
+

 .vitem &$found_extension$&
 .vindex "&$found_extension$&"
 This variable is available when Exim is compiled with the
 .vitem &$found_extension$&
 .vindex "&$found_extension$&"
 This variable is available when Exim is compiled with the

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index f40fbedfd9a95f0a10995ad588ff4747bfe94ca1..8cb2d0dbdd40b4ef380481c8635a0270a5efb07d 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -6,6 +6,14 @@ 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
 the documentation is updated, this file is reduced to a short list.
 
 test from the snapshots or the CVS before the documentation is updated. Once
 the documentation is updated, this file is reduced to a short list.
 

+Version 4.86
+------------
+
+ 1. Support for using the system standard CA bundle.
+
+ 2. New expansion items $config_file, $config_dir, containing the file
+    and directory name of the main configuration file. Also $exim_version.
+

 Version 4.85
 ------------
 
 Version 4.85
 ------------
 


@@ -25,9 +33,6 @@ Version 4.85
     server certs used for TLS match the result of the MX lookup. It does
     not use the same mechanism as DANE.
 
     server certs used for TLS match the result of the MX lookup. It does
     not use the same mechanism as DANE.
 

- 4. New expansion items $config_file, $config_dir, containing the file
-    and directory name of the main configuration file. 
-

 
 Version 4.84
 ------------
 
 Version 4.84
 ------------

diff --git a/src/src/expand.c b/src/src/expand.c
index 0e9dff27fe5edc5b7c01f6b6413b825523ce0b83..850439083fb98ca695ecff17b96adefcfbc79f82 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -503,6 +503,7 @@ static var_entry var_table[] = {
   { "exim_gid",            vtype_gid,         &exim_gid },
   { "exim_path",           vtype_stringptr,   &exim_path },
   { "exim_uid",            vtype_uid,         &exim_uid },
   { "exim_gid",            vtype_gid,         &exim_gid },
   { "exim_path",           vtype_stringptr,   &exim_path },
   { "exim_uid",            vtype_uid,         &exim_uid },

+  { "exim_version",        vtype_stringptr,   &version_string },

 #ifdef WITH_OLD_DEMIME
   { "found_extension",     vtype_stringptr,   &found_extension },
 #endif
 #ifdef WITH_OLD_DEMIME
   { "found_extension",     vtype_stringptr,   &found_extension },
 #endif

diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002
index 11fa1cd138948efee5265efc0cf4e353e6d9a64b..328f5a3caa264928b6aeed6eba665accd88e91fe 100644 (file)
--- a/test/scripts/0000-Basic/0002
+++ b/test/scripts/0000-Basic/0002
@@ -15,6 +15,7 @@ exim -be
 # Some fixed variables
 
 exim_path: $exim_path
 # Some fixed variables
 
 exim_path: $exim_path

+exim_version: $exim_version

 config_dir: $config_dir
 config_file: $config_file
 primary_hostname: $primary_hostname
 config_dir: $config_dir
 config_file: $config_file
 primary_hostname: $primary_hostname

diff --git a/test/stdout/0002 b/test/stdout/0002
index 00ac02a2e76cf95ee5ea4c1ce09caa6c9e48fcd5..6c195b2691f783bc7c99d8c63fcb1510e533cd45 100644 (file)
--- a/test/stdout/0002
+++ b/test/stdout/0002
@@ -6,6 +6,7 @@
 > # Some fixed variables
 > 
 > exim_path: TESTSUITE/eximdir/exim
 > # Some fixed variables
 > 
 > exim_path: TESTSUITE/eximdir/exim

+> exim_version: x.yz

 > config_dir: TESTSUITE
 > config_file: TESTSUITE/test-config
 > primary_hostname: myhost.test.ex
 > config_dir: TESTSUITE
 > config_file: TESTSUITE/test-config
 > primary_hostname: myhost.test.ex