From 05f5df397c2ea6089cad894c867432f74e6b77fe Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Tue, 23 Mar 2010 10:17:00 +0000
Subject: [PATCH] Now links users to mumble, and check_user works with virtual
 servers

---
 settings.py                     | 4 ++--
 sso/services/mumble/__init__.py | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/settings.py b/settings.py
index 249751b..5d0778d 100644
--- a/settings.py
+++ b/settings.py
@@ -112,9 +112,9 @@ JABBER_AUTH_PASSWD = 'pepperllama34'
 ### Mumble Service Settings
 
 DEFAULT_CONN = 'Meta:tcp -h 127.0.0.1 -p 6502'
-MUMBLE_DEFAULT_PORT = 64738
+MUMBLE_DEFAULT_PORT = 64740
 SLICE = 'Murmur.ice'
-MUMBLE_SERVER_ID = 1
+MUMBLE_SERVER_ID = 2
 
 ### Wiki Service Settings
 
diff --git a/sso/services/mumble/__init__.py b/sso/services/mumble/__init__.py
index 7cbfc33..71b42d4 100644
--- a/sso/services/mumble/__init__.py
+++ b/sso/services/mumble/__init__.py
@@ -18,13 +18,17 @@ class MumbleService(BaseService):
         mumbleuser.name = username
         mumbleuser.password = password
         mumbleuser.server = self._get_server()
+
+        if 'user' in kwargs:
+            mumbleuser.user = kwargs['user']
+
         mumbleuser.save()
         return mumbleuser.name
 
     def check_user(self, username):
         """ Check if the username exists """
         try:
-            mumbleuser = MumbleUser.objects.get(name=username)
+            mumbleuser = MumbleUser.objects.get(name=username, server=self._get_server())
         except MumbleUser.DoesNotExist:
             return False
         else: