diff options
| author | Djalal Harouni <tixxdz@opendz.org> | 2017-07-10 00:19:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-10 00:19:44 +0200 |
| commit | 09b4922aff7faa5f2139b22c08f6129bb1ef438c (patch) | |
| tree | f81b60c9300aaa5c8b68390b43c9703808c1382f /src | |
| parent | 41b2478d52828d161b270db826a7d10f54264910 (diff) | |
| parent | a99e002cc863c27008a60490cdf76b69b9efb8c1 (diff) | |
| download | systemd-09b4922aff7faa5f2139b22c08f6129bb1ef438c.tar.gz systemd-09b4922aff7faa5f2139b22c08f6129bb1ef438c.tar.bz2 systemd-09b4922aff7faa5f2139b22c08f6129bb1ef438c.zip | |
Merge pull request #6289 from keszybz/config-tweaks
Config parsing tweaks
Diffstat (limited to 'src')
| -rw-r--r-- | src/basic/log.c | 8 | ||||
| -rw-r--r-- | src/resolve/resolved-manager.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/basic/log.c b/src/basic/log.c index e272564993..ab1e6cac1e 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -1041,19 +1041,19 @@ void log_parse_environment_realm(LogRealm realm) { user stuff. */ (void) proc_cmdline_parse(parse_proc_cmdline_item, NULL, PROC_CMDLINE_STRIP_RD_PREFIX); - e = secure_getenv("SYSTEMD_LOG_TARGET"); + e = getenv("SYSTEMD_LOG_TARGET"); if (e && log_set_target_from_string(e) < 0) log_warning("Failed to parse log target '%s'. Ignoring.", e); - e = secure_getenv("SYSTEMD_LOG_LEVEL"); + e = getenv("SYSTEMD_LOG_LEVEL"); if (e && log_set_max_level_from_string_realm(realm, e) < 0) log_warning("Failed to parse log level '%s'. Ignoring.", e); - e = secure_getenv("SYSTEMD_LOG_COLOR"); + e = getenv("SYSTEMD_LOG_COLOR"); if (e && log_show_color_from_string(e) < 0) log_warning("Failed to parse bool '%s'. Ignoring.", e); - e = secure_getenv("SYSTEMD_LOG_LOCATION"); + e = getenv("SYSTEMD_LOG_LOCATION"); if (e && log_show_location_from_string(e) < 0) log_warning("Failed to parse bool '%s'. Ignoring.", e); } diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index cc9b26d4d5..b6620875ea 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -583,7 +583,7 @@ int manager_new(Manager **ret) { r = manager_parse_config_file(m); if (r < 0) - return r; + log_warning_errno(r, "Failed to parse configuration file: %m"); r = sd_event_default(&m->event); if (r < 0) |