sysadmin-bin r77 - trunk

[ovitters svn gnome org]

Author: ovitters
Date: Sun Jul 13 09:36:53 2008
New Revision: 77
URL: http://svn.gnome.org/viewvc/sysadmin-bin?rev=77&view=rev

Log:
	* create-auth (get_uids_from_group, get_uids_from_sysadmin): Make
	get_uids_from_group return an empty list on failure. Make
	get_uids_from_sysadmin fall back to using LDAP if the sysadmin group
	isn't defined on this server (is the case on label.gnome.org).



Modified:
   trunk/ChangeLog
   trunk/create-auth

Modified: trunk/create-auth
==============================================================================
--- trunk/create-auth	(original)
+++ trunk/create-auth	Sun Jul 13 09:36:53 2008
@@ -48,7 +48,7 @@
         print e
         sys.exit(1)
 
-    return {}
+    return []
 
 def get_uids_from_wheel():
     try:
@@ -60,10 +60,14 @@
     return filter (lambda x: x != 'root', people)
     
 def get_uids_from_sysadmin():
-    wheelinfo = grp.getgrnam ('sysadmin')
-    people = wheelinfo[3]
+    # XXX 
+    try:
+        people = grp.getgrnam ('sysadmin')[3]
+    except KeyError:
+        # Server doesn't have an LDAP connection -- probably the label server
+        people = get_uids_from_group('sysadmin')
+
     return filter (lambda x: x != 'root', people)
-    
 
 def create_user_from_uid(uid):
     filter = "(&(uid=%s)(authorizedKey=*))" % uid