diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-04-24 14:10:06 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-05-03 13:57:04 +0200 |
| commit | 42500c274a0858ee27fc5d54b02b90809f2ecd87 (patch) | |
| tree | b9e95d636311a08fc4639e73a4d12ab7273afc91 /src/libcharon/plugins/sql | |
| parent | 18758e3d2ea173b798a827917e4f8a1f9c4bc9a2 (diff) | |
| download | strongswan-42500c274a0858ee27fc5d54b02b90809f2ecd87.tar.bz2 strongswan-42500c274a0858ee27fc5d54b02b90809f2ecd87.tar.xz | |
Use name from initialization to access settings in libcharon.
Also fixes several whitespace errors.
Diffstat (limited to 'src/libcharon/plugins/sql')
| -rw-r--r-- | src/libcharon/plugins/sql/sql_logger.c | 2 | ||||
| -rw-r--r-- | src/libcharon/plugins/sql/sql_plugin.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libcharon/plugins/sql/sql_logger.c b/src/libcharon/plugins/sql/sql_logger.c index e7267b875..093053516 100644 --- a/src/libcharon/plugins/sql/sql_logger.c +++ b/src/libcharon/plugins/sql/sql_logger.c @@ -140,7 +140,7 @@ sql_logger_t *sql_logger_create(database_t *db) .db = db, .recursive = thread_value_create(NULL), .level = lib->settings->get_int(lib->settings, - "charon.plugins.sql.loglevel", -1), + "%s.plugins.sql.loglevel", -1, charon->name), ); return &this->public; diff --git a/src/libcharon/plugins/sql/sql_plugin.c b/src/libcharon/plugins/sql/sql_plugin.c index fc05fa547..afbb89c83 100644 --- a/src/libcharon/plugins/sql/sql_plugin.c +++ b/src/libcharon/plugins/sql/sql_plugin.c @@ -80,7 +80,8 @@ plugin_t *sql_plugin_create() char *uri; private_sql_plugin_t *this; - uri = lib->settings->get_str(lib->settings, "charon.plugins.sql.database", NULL); + uri = lib->settings->get_str(lib->settings, "%s.plugins.sql.database", + NULL, charon->name); if (!uri) { DBG1(DBG_CFG, "sql plugin: database URI not set"); |