[CalendarServer-changes] [1095] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1095
          http://trac.macosforge.org/projects/calendarserver/changeset/1095
Author:   dreid at apple.com
Date:     2007-01-24 10:26:11 -0800 (Wed, 24 Jan 2007)

Log Message:
-----------
Don't quote daemonize so we can launch without a -X argument.  Doon't break completely if there is no kerberos module.

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/twistedcaldav/directory/directory.py

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2007-01-24 18:13:59 UTC (rev 1094)
+++ CalendarServer/trunk/bin/caldavd	2007-01-24 18:26:11 UTC (rev 1095)
@@ -113,4 +113,4 @@
 
 export PYTHONPATH
 
-exec "${python}" "${twistdpath}" "${daemonize}" ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type};
+exec "${python}" "${twistdpath}" ${daemonize} ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type};

Modified: CalendarServer/trunk/twistedcaldav/directory/directory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/directory.py	2007-01-24 18:13:59 UTC (rev 1094)
+++ CalendarServer/trunk/twistedcaldav/directory/directory.py	2007-01-24 18:26:11 UTC (rev 1095)
@@ -37,7 +37,11 @@
 from twisted.cred.checkers import ICredentialsChecker
 from twisted.web2.dav.auth import IPrincipalCredentials
 
-from twistedcaldav.authkerb import NegotiateCredentials
+try:
+    from twistedcaldav.authkerb import NegotiateCredentials
+except ImportError:
+    NegotiateCredentials=None
+
 from twistedcaldav.directory.idirectory import IDirectoryService, IDirectoryRecord
 from twistedcaldav.directory.util import uuidFromName
 
@@ -94,7 +98,8 @@
             raise UnauthorizedLogin("No such user: %s" % (user,))
 
         # Handle Kerberos as a separate behavior
-        if isinstance(credentials.credentials, NegotiateCredentials):
+        if NegotiateCredentials and isinstance(credentials.credentials, 
+                                               NegotiateCredentials):
             # If we get here with Kerberos, then authentication has already succeeded
             return (
                 credentials.authnPrincipal.principalURL(),

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