From: Evan Broder <broder@mit.edu>
Date: Tue, 11 Aug 2009 01:54:07 +0000 (-0400)
Subject: invirt-console:
X-Git-Tag: 0.2.11~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/d11794258bb60d58b4075165162058fd307a0cee?ds=inline

invirt-console:
  * Give the website access to all consoles in preparation for exposing
    AjaxTerm.

svn path=/trunk/packages/invirt-console/; revision=2426
---

diff --git a/debian/changelog b/debian/changelog
index ea56aed..cc625ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+invirt-console (0.2.10) unstable; urgency=low
+
+  * Give the website access to all consoles in preparation for exposing
+    AjaxTerm.
+
+ -- Evan Broder <broder@mit.edu>  Mon, 10 Aug 2009 17:54:12 -0700
+
 invirt-console (0.2.9) unstable; urgency=high
 
   * Don't allow any sort of port forwarding to the console server.
diff --git a/server/usr/bin/invirt-consolefs b/server/usr/bin/invirt-consolefs
index 359ad16..a23ae5c 100755
--- a/server/usr/bin/invirt-consolefs
+++ b/server/usr/bin/invirt-consolefs
@@ -70,8 +70,12 @@ class ConsoleFS(routefs.RouteFS):
     def getK5login(self, machine, **kw):
         self.recache()
         machine = self.machines[machine]
-        users = [acl.user for acl in machine.acl]
-        return "\n".join(map(self.userToPrinc, users) + [''])
+        users = (acl.user for acl in machine.acl)
+        users = [self.userToPrinc(u) for u in users]
+        users.append('daemon/%s@%s' % (config.web.hostname,
+                                       config.kerberos.realm))
+        users.append('')
+        return "\n".join(users)
     
     def mirrorPath(self, path):
         """Translate a virtual path to its real path counterpart"""