From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 2 Dec 2010 16:46:39 +0000 (+0100)
Subject: X.org's admin permission is prevails over X.net-group's permissions.
X-Git-Tag: xorg/1.0.2~32^2~27
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=9b12102b1834709cd29305e6bae700058adcd131;p=platal.git

X.org's admin permission is prevails over X.net-group's permissions.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/bin/lists.rpc.py b/bin/lists.rpc.py
index c456f35..e9529ae 100755
--- a/bin/lists.rpc.py
+++ b/bin/lists.rpc.py
@@ -137,7 +137,7 @@ class BasicAuthXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                               % (PLATAL_DOMAIN, uid, md5))
         if res:
             name, forlife, perms = res
-            if vhost != PLATAL_DOMAIN:
+            if vhost != PLATAL_DOMAIN and perms != 'admin':
                 res = mysql_fetchone ("""SELECT  m.uid, IF(m.perms = 'admin', 'admin', 'lists')
                                            FROM  group_members AS m
                                      INNER JOIN  groups        AS g ON (m.asso_id = g.id)