From 31f0a0cee61d9db0206ca3f9287425a7f51908ae Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 2 Sep 2010 22:38:41 +0100 Subject: [PATCH] Return ACLs and use them instead of making a second call --- sso/services/mumble/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sso/services/mumble/__init__.py b/sso/services/mumble/__init__.py index 48f71d9..57c08a2 100644 --- a/sso/services/mumble/__init__.py +++ b/sso/services/mumble/__init__.py @@ -15,6 +15,7 @@ class MumbleService(BaseService): def __init__(self): Ice.loadSlice(self.settings['ice_file']) import Murmur + self.mur = Murmur @property def mumblectl(self): @@ -101,7 +102,7 @@ class MumbleService(BaseService): newgroups = False for agroup in groups: if not agroup.name.replace(' ', '').lower() in glist: - group = Murmur.Group() + group = self.mur.Group() group.name = group.name.replace(' ', '').lower() group.inheritable = True group.inherit = True @@ -112,6 +113,8 @@ class MumbleService(BaseService): if newgroups: self.mumblectl.setACL(self.settings['mumble_server_id'], 0, acls[0], acls[1], acls[2]) + return acls + def update_groups(self, uid, groups): """ Update the UID's groups based on the provided list """ @@ -120,9 +123,8 @@ class MumbleService(BaseService): if not user: return False - self._create_groups(groups) - - acls = self.mumblectl.getACL(self.settings['mumble_server_id'], 0) + acls = self._create_groups(groups) + #acls = self.mumblectl.getACL(self.settings['mumble_server_id'], 0) for agroup in groups: gid = 0