From bed11ebb6000394aff95dbe07c7ec414daa95db4 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Wed, 19 Nov 2014 15:11:14 +0100
Subject: [PATCH] Security: Load user permissions and restrictions from
 roles.ini

refs #5647
---
 library/Icinga/Authentication/Manager.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/Icinga/Authentication/Manager.php b/library/Icinga/Authentication/Manager.php
index 88258351e..0a9b40981 100644
--- a/library/Icinga/Authentication/Manager.php
+++ b/library/Icinga/Authentication/Manager.php
@@ -107,8 +107,9 @@ class Manager
         }
         $user->setGroups($groups);
         $admissionLoader = new AdmissionLoader();
-        $user->setPermissions($admissionLoader->getPermissions($user));
-        $user->setRestrictions($admissionLoader->getRestrictions($user));
+        list($permissions, $restrictions) = $admissionLoader->getPermissionsAndRestrictions($user);
+        $user->setPermissions($permissions);
+        $user->setRestrictions($restrictions);
         $this->user = $user;
         if ($persist) {
             $this->persistCurrentUser();