aboutsummaryrefslogtreecommitdiffstats
path: root/src/Permission.cxx
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Permission.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Permission.cxx b/src/Permission.cxx
index a35c80e94..d6c267ab7 100644
--- a/src/Permission.cxx
+++ b/src/Permission.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
+ * Copyright (C) 2003-2014 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
#include "config.h"
#include "Permission.hxx"
-#include "ConfigData.hxx"
-#include "ConfigGlobal.hxx"
-#include "ConfigOption.hxx"
+#include "config/ConfigData.hxx"
+#include "config/ConfigGlobal.hxx"
+#include "config/ConfigOption.hxx"
#include "system/FatalError.hxx"
#include <algorithm>
@@ -92,7 +92,7 @@ void initPermissions(void)
permission_default = PERMISSION_READ | PERMISSION_ADD |
PERMISSION_CONTROL | PERMISSION_ADMIN;
- param = config_get_next_param(CONF_PASSWORD, NULL);
+ param = config_get_param(CONF_PASSWORD);
if (param) {
permission_default = 0;
@@ -115,7 +115,7 @@ void initPermissions(void)
permission_passwords.insert(std::make_pair(std::move(password),
permission));
- } while ((param = config_get_next_param(CONF_PASSWORD, param)));
+ } while ((param = param->next) != nullptr);
}
param = config_get_param(CONF_DEFAULT_PERMS);