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

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

diff --git a/code/main.py b/code/main.py
index cffa809..8a5e001 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -681,7 +681,7 @@ def getUser(environ):
     
     if environ.get('AUTH_TYPE') == 'Negotiate':
         # Convert the krb5 principal into a krb4 username
     
     if environ.get('AUTH_TYPE') == 'Negotiate':
         # Convert the krb5 principal into a krb4 username

-        if not user.endswith('@%s' % config.authn[0].realm):
+        if not user.endswith('@%s' % config.kerberos.realm):

             return
         else:
             return user.split('@')[0].replace('/', '.')
             return
         else:
             return user.split('@')[0].replace('/', '.')

diff --git a/debian/changelog b/debian/changelog
index f8df205..216ed72 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-web (0.0.15) unstable; urgency=low
+
+  * config.{authn[0] => kerberos}.realm
+
+ --
+

 invirt-web (0.0.14) unstable; urgency=low
 
   * Depend on invirt-web-iptables
 invirt-web (0.0.14) unstable; urgency=low
 
   * Depend on invirt-web-iptables

diff --git a/files/etc/apache2/sites-available/ssl.mako b/files/etc/apache2/sites-available/ssl.mako
index 9875db1..ec47ec3 100644 (file)
--- a/files/etc/apache2/sites-available/ssl.mako
+++ b/files/etc/apache2/sites-available/ssl.mako
@@ -75,7 +75,7 @@ ${caller.body()}
                KrbMethodNegotiate on
                KrbMethodK5Passwd off
                KrbAuthoritative off
                KrbMethodNegotiate on
                KrbMethodK5Passwd off
                KrbAuthoritative off

-               KrbAuthRealms ${cfg.authn[0].realm}
+               KrbAuthRealms ${cfg.kerberos.realm}

                Krb5Keytab /etc/invirt/keytab
                KrbSaveCredentials off
        </%call>
                Krb5Keytab /etc/invirt/keytab
                KrbSaveCredentials off
        </%call>