diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2014-04-29 11:39:57 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2014-05-15 11:28:09 +0200 |
| commit | f65ac98c645e5b5798ecdd7b81b22c1978cbf1dc (patch) | |
| tree | 989f9babc83e656b75a970155fb0504c642b2927 /src | |
| parent | 8b43c9ba349d7370eb82e8340f48a7045d9c5c5e (diff) | |
| download | strongswan-f65ac98c645e5b5798ecdd7b81b22c1978cbf1dc.tar.bz2 strongswan-f65ac98c645e5b5798ecdd7b81b22c1978cbf1dc.tar.xz | |
settings: Reduce log verbosity if files can't be opened
Basically reintroducing 2a38b4556e9fd8102bd6c6c61f2893599a5e8e51.
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/settings/settings_parser.y | 11 | ||||
| -rw-r--r-- | src/libstrongswan/utils/parser_helper.c | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/libstrongswan/settings/settings_parser.y b/src/libstrongswan/settings/settings_parser.y index b81003f29..d5566df9d 100644 --- a/src/libstrongswan/settings/settings_parser.y +++ b/src/libstrongswan/settings/settings_parser.y @@ -255,7 +255,16 @@ bool settings_parser_parse_file(section_t *root, char *name) helper->file_include(helper, name); if (!settings_parser_open_next_file(helper)) { - DBG1(DBG_CFG, "failed to open config file '%s'", name); +#ifdef STRONGSWAN_CONF + if (streq(name, STRONGSWAN_CONF)) + { + DBG2(DBG_CFG, "failed to open config file '%s'", name); + } + else +#endif + { + DBG1(DBG_CFG, "failed to open config file '%s'", name); + } } else { diff --git a/src/libstrongswan/utils/parser_helper.c b/src/libstrongswan/utils/parser_helper.c index fb549a572..509316665 100644 --- a/src/libstrongswan/utils/parser_helper.c +++ b/src/libstrongswan/utils/parser_helper.c @@ -111,7 +111,7 @@ METHOD(parser_helper_t, file_next, parser_helper_file_t*, array_insert(this->files, ARRAY_TAIL, next); return &next->public; } - PARSER_DBG1(&this->public, "unable to open '%s'", name); + PARSER_DBG2(&this->public, "unable to open '%s'", name); parser_helper_file_destroy(next); } file->matches->destroy(file->matches); |