From db078c6e0db1aa83c6b788095c31c09a3873b2ca Mon Sep 17 00:00:00 2001
From: Maurizio Porrato <maurizio.porrato@gmail.com>
Date: Sat, 28 Aug 2010 19:54:25 +0200
Subject: [PATCH] Fix ClientTracker.isAdmin()

---
 frn/clienttracker.py   | 4 ++--
 frn/protocol/server.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frn/clienttracker.py b/frn/clienttracker.py
index 9dfb87a..d970540 100644
--- a/frn/clienttracker.py
+++ b/frn/clienttracker.py
@@ -83,8 +83,8 @@ class ClientTracker(object):
     def isBlocked(self, clientId):
         return clientId in self._block
 
-    def isAdmin(self, email):
-        return email in self._admin
+    def isAdmin(self, clientId):
+        return clientId in self._admin
 
     def login(self, client, status=0):
         clientId = client.user.ID
diff --git a/frn/protocol/server.py b/frn/protocol/server.py
index 52efc91..52b58bc 100644
--- a/frn/protocol/server.py
+++ b/frn/protocol/server.py
@@ -115,7 +115,7 @@ class FRNServer(BufferingLineReceiver, TimeoutMixin):
             if self.role == 'OK':
                 if self.user.EA == self.factory.serverAuth.OW:
                     self.role = 'OWNER'
-                elif self.factory.tracker.isAdmin(self.user.EA):
+                elif self.factory.tracker.isAdmin(self.user.ID):
                     self.role = 'ADMIN'
             if versions.server > 2009004:
                 self.waitingKey = True