oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/Configured: disallow both "db_file" and "database" 

This is misconfiguration, and MPD should abort.
This commit is contained in:
Max Kellermann 2014-02-17 21:59:41 +01:00
parent de160bb2d1
commit 1ddd00433e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/db/Configured.cxx
View File

@ -23,6 +23,7 @@
#include "config/ConfigGlobal.hxx" #include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx" #include "config/ConfigData.hxx"
#include "config/ConfigError.hxx" #include "config/ConfigError.hxx"
#include "util/Error.hxx"
#include "Log.hxx" #include "Log.hxx"
Database * Database *
@ -32,9 +33,12 @@ CreateConfiguredDatabase(EventLoop &loop, DatabaseListener &listener,
const struct config_param *param = config_get_param(CONF_DATABASE); const struct config_param *param = config_get_param(CONF_DATABASE);
const struct config_param *path = config_get_param(CONF_DB_FILE); const struct config_param *path = config_get_param(CONF_DB_FILE);
if (param != nullptr && path != nullptr) if (param != nullptr && path != nullptr) {
LogWarning(config_domain, error.Format(config_domain,
"Found both 'database' and 'db_file' setting - ignoring the latter"); "Found both 'database' (line %d) and 'db_file' (line %d) setting",
param->line, path->line);
return nullptr;
}
if (!have_storage) { if (!have_storage) {
if (param != nullptr) if (param != nullptr)