From f45c29ba620887d79271d568dca5f404e52573cb Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 11 Mar 2016 23:44:53 +0100 Subject: [PATCH] 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) --- doc/doc-docbook/spec.xfpt | 7 ++++--- src/src/readconf.c | 6 +++--- test/confs/0615 | 1 + test/stderr/0615 | 20 ++++++++------------ 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index f6c33fe01..dd68ed560 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -14007,9 +14007,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 83d198d33..569c96c8a 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -3344,10 +3344,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 bbfc4978a..86ecee108 100644 --- 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 85ee6f760..d8d0f8547 100644 --- 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. -- 2.30.2