                      response = UnauthorizedResponse(request.credentialFactories,
                                                      request.remoteAddr)
                  else:
-@@ -594,22 +650,29 @@
-             return d
- 
-         d = maybeDeferred(self.authenticate, request)
--        d.addCallbacks(onAuth, onError)
-+        d.addCallback(onAuth)
-+        d.addErrback(onError)
- 
-         return d
+@@ -600,16 +656,22 @@
  
      def authenticate(self, request):
          def loginSuccess(result):

     # HTTP
     ##
 
@@ -1558,7 +1923,7 @@
     """
     DAV resource with no children.
     """

     def defaultAccessControlList(self):
         """
         @return: the L{davxml.ACL} element containing the default access control
@@ -1146,49 +1205,95 @@
 
         This implementation returns an empty set.
         """
