From 21f12b917c98d2a225010b2038e8aa47af05841e Mon Sep 17 00:00:00 2001
From: David Bartley <dtbartle@csclub.uwaterloo.ca>
Date: Wed, 28 Nov 2007 03:38:45 -0500
Subject: [PATCH] Office staff can modify office staff

---
 pylib/csc/apps/urwid/groups.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pylib/csc/apps/urwid/groups.py b/pylib/csc/apps/urwid/groups.py
index 0dd31a7..e3f576a 100644
--- a/pylib/csc/apps/urwid/groups.py
+++ b/pylib/csc/apps/urwid/groups.py
@@ -23,12 +23,14 @@ def group_members(data):
     data, euid = data
 
     # only syscom may modify non-club groups
-    user = pwd.getpwuid(euid).pw_name
-    users = grp.getgrnam('syscom').gr_mem
-    if user not in users:
-        member = members.get(data['group'])
-        if member is None or 'objectClass' not in member or 'club' not in member['objectClass']:
-            return
+    if data['group'] != 'office':
+        user = pwd.getpwuid(euid).pw_name
+        users = grp.getgrnam('syscom').gr_mem
+        if user not in users:
+            member = members.get(data['group'])
+            if member is None or 'objectClass' not in member \
+                    or 'club' not in member['objectClass']:
+                return
 
     add_data = data.copy()
     add_data['type'] = 'Add'