[CalendarServer-changes] [1212] CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 1212
          http://trac.macosforge.org/projects/calendarserver/changeset/1212
Author:   cdaboo at apple.com
Date:     2007-02-19 13:38:13 -0800 (Mon, 19 Feb 2007)

Log Message:
-----------
Authentication should use the GUID to identify a user not the user id, as it is possible to have multiple
directory sources which may contain the same user id, but represent different users - GUID will be unique.

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

Modified: CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-02-19 21:37:40 UTC (rev 1211)
+++ CalendarServer/trunk/twistedcaldav/directory/appleopendirectory.py	2007-02-19 21:38:13 UTC (rev 1212)
@@ -505,7 +505,7 @@
     def verifyCredentials(self, credentials):
         if isinstance(credentials, UsernamePassword):
             try:
-                return opendirectory.authenticateUserBasic(self.service.directory, self.shortName, credentials.password)
+                return opendirectory.authenticateUserBasic(self.service.directory, self.guid, self.shortName, credentials.password)
             except opendirectory.ODError, e:
                 log.err("Open Directory (node=%s) error while performing basic authentication for user %s: %r"
                         % (self.service.realmName, self.shortName, e))

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