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

Permission: use struct ConfigData

Browse Source
This commit is contained in:
Max Kellermann 2018-07-17 23:00:42 +02:00
parent 60b2338091
commit a9b8d5ecb6
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.cxx
View File

@ -551,7 +551,7 @@ try {
glue_mapper_init(raw_config); glue_mapper_init(raw_config);
initPermissions(); initPermissions(raw_config);
spl_global_init(raw_config); spl_global_init(raw_config);
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
archive_plugin_init_all(); archive_plugin_init_all();

11
src/Permission.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "Permission.hxx" #include "Permission.hxx"
#include "config/Param.hxx" #include "config/Param.hxx"
#include "config/Global.hxx" #include "config/Data.hxx"
#include "config/Option.hxx" #include "config/Option.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
@ -87,7 +87,8 @@ static unsigned parsePermissions(const char *string)
return permission; return permission;
} }
void initPermissions(void) void
initPermissions(const ConfigData &config)
{ {
unsigned permission; unsigned permission;
const ConfigParam *param; const ConfigParam *param;
@ -95,7 +96,7 @@ void initPermissions(void)
permission_default = PERMISSION_READ | PERMISSION_ADD | permission_default = PERMISSION_READ | PERMISSION_ADD |
PERMISSION_CONTROL | PERMISSION_ADMIN; PERMISSION_CONTROL | PERMISSION_ADMIN;
param = config_get_param(ConfigOption::PASSWORD); param = config.GetParam(ConfigOption::PASSWORD);
if (param) { if (param) {
permission_default = 0; permission_default = 0;
@ -121,13 +122,13 @@ void initPermissions(void)
} while ((param = param->next) != nullptr); } while ((param = param->next) != nullptr);
} }
param = config_get_param(ConfigOption::DEFAULT_PERMS); param = config.GetParam(ConfigOption::DEFAULT_PERMS);
if (param) if (param)
permission_default = parsePermissions(param->value.c_str()); permission_default = parsePermissions(param->value.c_str());
#ifdef HAVE_UN #ifdef HAVE_UN
param = config_get_param(ConfigOption::LOCAL_PERMISSIONS); param = config.GetParam(ConfigOption::LOCAL_PERMISSIONS);
if (param != nullptr) if (param != nullptr)
local_permissions = parsePermissions(param->value.c_str()); local_permissions = parsePermissions(param->value.c_str());
else else

4
src/Permission.hxx
View File

@ -22,6 +22,8 @@
#include "check.h" #include "check.h"
struct ConfigData;
static constexpr unsigned PERMISSION_NONE = 0; static constexpr unsigned PERMISSION_NONE = 0;
static constexpr unsigned PERMISSION_READ = 1; static constexpr unsigned PERMISSION_READ = 1;
static constexpr unsigned PERMISSION_ADD = 2; static constexpr unsigned PERMISSION_ADD = 2;
@ -39,6 +41,6 @@ GetLocalPermissions() noexcept;
#endif #endif
void void
initPermissions(); initPermissions(const ConfigData &config);
#endif #endif