Index: trunk/packages/invirt-vnc-server/debian/changelog
===================================================================
--- trunk/packages/invirt-vnc-server/debian/changelog	(revision 1964)
+++ trunk/packages/invirt-vnc-server/debian/changelog	(revision 1965)
@@ -1,2 +1,8 @@
+invirt-vnc-server (0.0.6) unstable; urgency=low
+
+  * Include the VNC host and port in the authentication token
+
+  -- Quentin Smith <quentin@mit.edu>  Thu, 08 Jan 2009 16:15:46 -0500
+
 invirt-vnc-server (0.0.5) unstable; urgency=low
 
Index: trunk/packages/invirt-vnc-server/invirt-vnc-authtoken
===================================================================
--- trunk/packages/invirt-vnc-server/invirt-vnc-authtoken	(revision 1964)
+++ trunk/packages/invirt-vnc-server/invirt-vnc-authtoken	(revision 1965)
@@ -9,4 +9,5 @@
 import base64
 from invirt.vnc import getTokenKey
+from invirt.config import structs as config
 
 def getAuthToken(username, machine, lifetime=5*60):
@@ -15,4 +16,10 @@
     data['machine'] = machine
     data['expires'] = time.time() + lifetime
+    data['connect_host'] = config.web.hostname
+    try:
+        data['connect_port'] = 10003 + [h.hostname for h in
+                                        config.hosts].index(os.uname()[1])
+    except:
+        data['connect_port'] = 5900
     pickled_data = cPickle.dumps(data)
     m = hmac.new(getTokenKey(), digestmod=sha)