From 8e58ed807c77febfde61d3cf47928302f93cc99c Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Fri, 11 Mar 2016 23:44:53 +0100 Subject: 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. --- src/src/readconf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/src/readconf.c b/src/src/readconf.c index 328d49558..0f696cbf5 100644 --- a/src/src/readconf.c +++ b/src/src/readconf.c @@ -3503,10 +3503,10 @@ if (gnutls_require_kx || gnutls_require_mac || gnutls_require_proto) " are obsolete\n"); #endif /*SUPPORT_TLS*/ -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."); + "Warning: purging the environment.\n" + " Suggested action: use keep_environment."); } -- cgit v1.2.3