Don't issue env warning if env is empty

keep_environment needs to be mentioned in the runtime config.
Setting add_environment isn't enough to suppress the warning.

(cherry picked from commit 8e58ed807c77febfde61d3cf47928302f93cc99c)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 0068b2f73f1b9c30bf0ed3b522aa43dacb27fdce..22ccf86e9a61a79d086ba8aab5528b5b63ce7e44 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -14388,9 +14388,10 @@ FOO and having FOO_HOME in your &%keep_environment%& option may have
 unexpected results. You may work around this using a regular expression
 that does not match the macro name: ^[F]OO_HOME$.
 
-Current versions of Exim issue a warning during startupif you do not mention
-&%keep_environment%& or &%add_environment%& in your runtime configuration
-file.
+Current versions of Exim issue a warning during startup if you do not mention
+&%keep_environment%& in your runtime configuration file and if there is
+anything in your environment. Future versions may not issue that warning
+anymore.
 .wen
 
 

diff --git a/src/src/readconf.c b/src/src/readconf.c
index d64721248b7b32e898d8b4011dbd5ca0f317a62d..83b2754846480ced276ae7552f50c49661201d51 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -3394,10 +3394,10 @@ if (openssl_options != NULL)
   }
 #endif
 
-if ((!add_environment || *add_environment == '\0') && !keep_environment)
+if (!keep_environment && environ && *environ)
   log_write(0, LOG_MAIN,
-      "WARNING: purging the environment.\n"
-      " Suggested action: use keep_environment and add_environment.\n");
+      "Warning: purging the environment.\n"
+      " Suggested action: use keep_environment.");
 }
 
 

diff --git a/test/confs/0615 b/test/confs/0615
index bbfc4978aa750917cb6c3caa19c7988a787a0081..86ecee108b9eefca52a9a66d6bb93b7bf423dc15 100644 (file)
--- a/test/confs/0615
+++ b/test/confs/0615
@@ -1,6 +1,7 @@
 # exim test configuration 0615
 exim_path = EXIM_PATH
 tls_advertise_hosts =
+spool_directory = DIR/spool
 perl_startup = $| = 1; \
        print "Environment visible in Perl:\n"; \
        print map { "$_=$ENV{$_}\n" } sort keys %ENV;

diff --git a/test/stderr/0615 b/test/stderr/0615
index 85ee6f7600b6763d04607c3bb06f94b63a9b3ccb..d8d0f8547dfd7533118ad13424ea4765a2585b5f 100644 (file)
--- a/test/stderr/0615
+++ b/test/stderr/0615
@@ -1,15 +1,11 @@
 LOG: MAIN
-  WARNING: purging the environment.
- Suggested action: use keep_environment and add_environment.
-
+  Warning: purging the environment.
+ Suggested action: use keep_environment.
 LOG: MAIN
-  WARNING: purging the environment.
- Suggested action: use keep_environment and add_environment.
-
+  Warning: purging the environment.
+ Suggested action: use keep_environment.
 LOG: MAIN
-  WARNING: purging the environment.
- Suggested action: use keep_environment and add_environment.
-
-1999-03-02 09:44:33 WARNING: purging the environment.
- Suggested action: use keep_environment and add_environment.
-
+  Warning: purging the environment.
+ Suggested action: use keep_environment.
+1999-03-02 09:44:33 Warning: purging the environment.
+ Suggested action: use keep_environment.