[CalendarServer-changes] [58] CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/authkerb.py

[source_changes at macosforge.org]

Revision: 58
Author:   cdaboo at apple.com
Date:     2006-08-24 13:11:38 -0700 (Thu, 24 Aug 2006)

Log Message:
-----------
Fix to allow calendar server to run. Note that this still needs to be re-worked for the new
credentials mechanism.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/authkerb.py

Modified: CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/authkerb.py
===================================================================
--- CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/authkerb.py	2006-08-24 20:08:55 UTC (rev 57)
+++ CalendarServer/branches/users/cdaboo/acl-merge/twistedcaldav/authkerb.py	2006-08-24 20:11:38 UTC (rev 58)
@@ -29,7 +29,7 @@
      that implements full GSSAPI authentication.
 """
 
-from twisted.web2.dav import auth
+from twisted.web2.auth.interfaces import ICredentialFactory
 from zope import interface
 from twisted.cred.credentials import ICredentials
 
@@ -87,7 +87,7 @@
         else:
             return False, None
         
-class BasicKerberosAuthorizer:
+class BasicKerberosCredentialFactory:
     """
     Authorizer for insecure Basic (base64-encoded plaintext) authentication.
 
@@ -95,7 +95,7 @@
     Right now we do not check for that.
     """
 
-    implements(auth.IAuthorizer)
+    implements(ICredentialFactory)
 
     def __init__(self, realm):
 
@@ -209,7 +209,7 @@
         else:
             return False, None
         
-class NegotiateAuthorizer:
+class NegotiateCredentialFactory:
     """
     Authorizer for insecure Basic (base64-encoded plaintext) authentication.
 
@@ -217,7 +217,7 @@
     Right now we do not check for that.
     """
 
-    implements(auth.IAuthorizer)
+    implements(ICredentialFactory)
 
     def __init__(self, service):
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20060824/b3522612/attachment.html