config.{authn[0] => kerberos}.realm

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

diff --git a/debian/changelog b/debian/changelog
index 9d4be73..ab643f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-console (0.2.4) unstable; urgency=low
+
+  * config.{authn[0] => kerberos}.realm
+
+ -- Evan Broder <broder@mit.edu>  Wed, 10 Dec 2008 23:06:24 -0500
+

 invirt-console (0.2.3) unstable; urgency=low
 
   * ...and /home/machines
 invirt-console (0.2.3) unstable; urgency=low
 
   * ...and /home/machines

diff --git a/host/usr/sbin/invirt-update-conserver b/host/usr/sbin/invirt-update-conserver
index 9a7fd3c..3d77c8b 100755 (executable)
--- a/host/usr/sbin/invirt-update-conserver
+++ b/host/usr/sbin/invirt-update-conserver
@@ -18,7 +18,7 @@ def reload_conserver():
 
 if __name__ == '__main__':
     hostname = socket.getfqdn().lower()
 
 if __name__ == '__main__':
     hostname = socket.getfqdn().lower()

-    realm = config.authn[0].realm
+    realm = config.kerberos.realm

     principal = 'host/'+hostname+'@'+realm
     conftext = '\n'.join('console %s { master %s; }' % (vm, hostname)
                          for vm in live_vms())
     principal = 'host/'+hostname+'@'+realm
     conftext = '\n'.join('console %s { master %s; }' % (vm, hostname)
                          for vm in live_vms())

diff --git a/server/etc/remctl/acl/invirt-console-server.mako b/server/etc/remctl/acl/invirt-console-server.mako
index f2fffe3..3443721 100644 (file)
--- a/server/etc/remctl/acl/invirt-console-server.mako
+++ b/server/etc/remctl/acl/invirt-console-server.mako
@@ -1,4 +1,4 @@
 <% from invirt.config import structs as cfg %>\
 % for h in cfg.hosts:
 <% from invirt.config import structs as cfg %>\
 % for h in cfg.hosts:

-host/${h.hostname}@${cfg.authn[0].realm}
+host/${h.hostname}@${cfg.kerberos.realm}

 % endfor
 % endfor

diff --git a/server/usr/bin/invirt-consolefs b/server/usr/bin/invirt-consolefs
index a3f75ec..4fdd9dd 100755 (executable)
--- a/server/usr/bin/invirt-consolefs
+++ b/server/usr/bin/invirt-consolefs
@@ -85,7 +85,7 @@ class ConsoleFS(routefs.RouteFS):
             (princ, realm) = user.split('@')
         else:
             princ = user
             (princ, realm) = user.split('@')
         else:
             princ = user

-            realm = config.authn[0].realm
+            realm = config.kerberos.realm

         
         return princ.replace('.', '/') + '@' + realm
 
         
         return princ.replace('.', '/') + '@' + realm