diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-03-11 23:44:53 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-03-12 00:10:01 +0100 |
| commit | 8e58ed807c77febfde61d3cf47928302f93cc99c (patch) | |
| tree | 43fb4232a5503bd6c463bebcbc93a97d7a25d933 /src | |
| parent | 3257ed4b66a48c2bbd3e558cce7990df937c7d21 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/readconf.c | 6 |
1 files changed, 3 insertions, 3 deletions
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."); } |