[CalendarServer-changes] [7840] CalendarServer/trunk/twistedcaldav/directory/principal.py

[source_changes at macosforge.org]

Revision: 7840
          http://trac.macosforge.org/projects/calendarserver/changeset/7840
Author:   wsanchez at apple.com
Date:     2011-08-01 13:29:47 -0700 (Mon, 01 Aug 2011)
Log Message:
-----------
Apply fix from Ticket #356.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2011-08-01 20:21:18 UTC (rev 7839)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2011-08-01 20:29:47 UTC (rev 7840)
@@ -48,7 +48,10 @@
 
 from twext.python.log import Logger
 
-from twistedcaldav.authkerb import NegotiateCredentials
+try:
+    from twistedcaldav.authkerb import NegotiateCredentials
+except ImportError:
+    NegotiateCredentials = None
 from twistedcaldav.config import config
 from twistedcaldav.cache import DisabledCacheNotifier, PropfindCacheMixin
 from twistedcaldav.directory import calendaruserproxy
@@ -153,7 +156,7 @@
         # Basic/Digest creds -> just lookup user name
         if isinstance(user, UsernamePassword) or isinstance(user, DigestedCredentials):
             return self.principalForUser(user.username)
-        elif isinstance(user, NegotiateCredentials):
+        elif NegotiateCredentials is not None and isinstance(user, NegotiateCredentials):
             authID = "Kerberos:%s" % (user.principal,)
             principal = self.principalForRecord(self.directory.recordWithAuthID(authID))
             if principal:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110801/4e574b4c/attachment.html>