[CalendarServer-changes] [1797] CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav /directory/directory.py

[source_changes at macosforge.org]

Revision: 1797
          http://trac.macosforge.org/projects/calendarserver/changeset/1797
Author:   wsanchez at apple.com
Date:     2007-08-17 15:55:39 -0700 (Fri, 17 Aug 2007)

Log Message:
-----------
Pulled up r1790 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/directory.py

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/directory.py	2007-08-17 22:54:45 UTC (rev 1796)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/directory/directory.py	2007-08-17 22:55:39 UTC (rev 1797)
@@ -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/fecfe5e0/attachment.html