[CalendarServer-changes] [1570] CalendarServer/trunk/twistedcaldav/tap.py

[source_changes at macosforge.org]

Revision: 1570
          http://trac.macosforge.org/projects/calendarserver/changeset/1570
Author:   cdaboo at apple.com
Date:     2007-05-24 19:22:17 -0700 (Thu, 24 May 2007)

Log Message:
-----------
Allow server to start even if Kerberos initialization fails.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/tap.py

Modified: CalendarServer/trunk/twistedcaldav/tap.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/tap.py	2007-05-24 23:27:46 UTC (rev 1569)
+++ CalendarServer/trunk/twistedcaldav/tap.py	2007-05-25 02:22:17 UTC (rev 1570)
@@ -446,11 +446,15 @@
                         log.msg("Kerberos support not available")
                         continue
 
-                    principal = schemeConfig['ServicePrincipal']
-                    if not principal:
-                        credFactory = NegotiateCredentialFactory(type="http", hostname=config.ServerHostName)
-                    else:
-                        credFactory = NegotiateCredentialFactory(principal=principal)
+                    try:
+                        principal = schemeConfig['ServicePrincipal']
+                        if not principal:
+                            credFactory = NegotiateCredentialFactory(type="http", hostname=config.ServerHostName)
+                        else:
+                            credFactory = NegotiateCredentialFactory(principal=principal)
+                    except ValueError:
+                        log.msg("Could not start Kerberos")
+                        continue
 
                 elif scheme == 'digest':
                     credFactory = QopDigestCredentialFactory(

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