nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-19 12:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Return ACLs and use them instead of making a second call

Browse Source
This commit is contained in:
Andrew Williams
2010-09-02 22:38:41 +01:00
parent 1ff6ae38f2
commit 31f0a0cee6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sso/services/mumble/__init__.py
View File

@@ -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