From f47917ac26563431fc6aaa5d30d683b4530aceff Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Wed, 24 Mar 2010 11:09:41 +0000
Subject: [PATCH] Add result checking to kickuser

---
 sso/services/jabber/xmppclient.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/sso/services/jabber/xmppclient.py b/sso/services/jabber/xmppclient.py
index fc4ffb9..7044a94 100644
--- a/sso/services/jabber/xmppclient.py
+++ b/sso/services/jabber/xmppclient.py
@@ -129,8 +129,10 @@ class JabberAdmin():
             return False
 
         pass = hashlib.sha1('%s%s%s' % (username, settings.SECRET_KEY, random.randint(0, 2147483647))).hexdigest()
-        self.resetpassword(username, pass)
-        self.kickuser(username)
+        if self.resetpassword(username, pass):
+            return self.kickuser(username)
+        else:
+            return False
 
     def kickuser(self, username):
         try:
@@ -150,7 +152,10 @@ class JabberAdmin():
         # Send request and pray for the best
         resp = self._client.SendAndWaitForResponse(iq)
 
-        return True
+        if resp.getAttrs()['type'] == "result":
+            return True
+        else:
+            return False
 
     def checkuser(self, username):
         try: