[CalendarServer-changes] [1790]
CalendarServer/trunk/twistedcaldav/directory/directory.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri Aug 17 11:24:57 PDT 2007
Revision: 1790
http://trac.macosforge.org/projects/calendarserver/changeset/1790
Author: cdaboo at apple.com
Date: 2007-08-17 11:24:56 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Due to a recursive import problem (authkerb imports logging imports directory again) Kerberos was not working
as the NegotiateCredentials import was failing. Import was moved into the code to avoid this.
Modified Paths:
--------------
CalendarServer/trunk/twistedcaldav/directory/directory.py
Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py 2007-08-15 01:45:17 UTC (rev 1789)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py 2007-08-17 18:24:56 UTC (rev 1790)
@@ -37,11 +37,6 @@
from twisted.cred.checkers import ICredentialsChecker
from twisted.web2.dav.auth import IPrincipalCredentials
-try:
- from twistedcaldav.authkerb import NegotiateCredentials
-except ImportError:
- NegotiateCredentials=None
-
from twistedcaldav.directory.idirectory import IDirectoryService, IDirectoryRecord
from twistedcaldav.directory.util import uuidFromName
@@ -98,6 +93,11 @@
raise UnauthorizedLogin("No such user: %s" % (user,))
# Handle Kerberos as a separate behavior
+ try:
+ from twistedcaldav.authkerb import NegotiateCredentials
+ except ImportError:
+ NegotiateCredentials=None
+
if NegotiateCredentials and isinstance(credentials.credentials,
NegotiateCredentials):
# If we get here with Kerberos, then authentication has already succeeded
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070817/c951e7e3/attachment.html
More information about the calendarserver-changes
mailing list