Index: /package_branches/invirt-web/cherrypy-rebased/code/cache_acls.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/cache_acls.py	(revision 2716)
+++ /package_branches/invirt-web/cherrypy-rebased/code/cache_acls.py	(revision 2717)
@@ -40,5 +40,5 @@
         return []
     try:
-        return getafsgroups.getAfsGroupMembers(name, config.authz.cells[0].cell)
+        return getafsgroups.getAfsGroupMembers(name, config.authz.afs.cells[0].cell)
     except getafsgroups.AfsProcessError:
         return []
Index: /package_branches/invirt-web/cherrypy-rebased/code/getafsgroups.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/getafsgroups.py	(revision 2716)
+++ /package_branches/invirt-web/cherrypy-rebased/code/getafsgroups.py	(revision 2717)
@@ -31,5 +31,5 @@
 def getAfsGroupMembers(group, cell):
     encrypt = True
-    for c in config.authz.cells:
+    for c in config.authz.afs.cells:
         if c.cell == cell and hasattr(c, 'auth'):
             encrypt = c.auth
Index: /package_branches/invirt-web/cherrypy-rebased/code/main.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2716)
+++ /package_branches/invirt-web/cherrypy-rebased/code/main.py	(revision 2717)
@@ -87,5 +87,5 @@
     def __getattr__(self, name):
         if name in ("admin", "overlord"):
-            if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz.cells[0].cell):
+            if not cherrypy.request.login in getAfsGroupMembers(config.adminacl, config.authz.afs.cells[0].cell):
                 raise InvalidInput('username', cherrypy.request.login,
                                    'Not in admin group %s.' % config.adminacl)
Index: /package_branches/invirt-web/cherrypy-rebased/code/validation.py
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/code/validation.py	(revision 2716)
+++ /package_branches/invirt-web/cherrypy-rebased/code/validation.py	(revision 2717)
@@ -223,5 +223,5 @@
         admin = 'system:' + admin
     try:
-        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.cells[0].cell):
+        if user in getafsgroups.getAfsGroupMembers(admin, config.authz.afs.cells[0].cell):
             return admin
     except getafsgroups.AfsProcessError, e:
Index: /package_branches/invirt-web/cherrypy-rebased/invirt-cache-acls
===================================================================
--- /package_branches/invirt-web/cherrypy-rebased/invirt-cache-acls	(revision 2716)
+++ /package_branches/invirt-web/cherrypy-rebased/invirt-cache-acls	(revision 2717)
@@ -1,6 +1,6 @@
 #!/bin/sh
 cells () {
-  for i in $(invirt-getconf -l authz.cells); do
-    invirt-getconf authz.cells.$i.cell
+  for i in $(invirt-getconf -l authz.afs.cells); do
+    invirt-getconf authz.afs.cells.$i.cell
   done
 }