[CalendarServer-changes] [4568] CalendarServer/branches/users/sagen/deployment-inherit-fds-4549/ twistedcaldav/directory/appleopendirectory.py

[source_changes at macosforge.org]

Revision: 4568
          http://trac.macosforge.org/projects/calendarserver/changeset/4568
Author:   sagen at apple.com
Date:     2009-10-02 10:34:48 -0700 (Fri, 02 Oct 2009)
Log Message:
-----------
Don't hash twice

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/deployment-inherit-fds-4549/twistedcaldav/directory/appleopendirectory.py

Modified: CalendarServer/branches/users/sagen/deployment-inherit-fds-4549/twistedcaldav/directory/appleopendirectory.py
===================================================================
--- CalendarServer/branches/users/sagen/deployment-inherit-fds-4549/twistedcaldav/directory/appleopendirectory.py	2009-10-02 04:19:13 UTC (rev 4567)
+++ CalendarServer/branches/users/sagen/deployment-inherit-fds-4549/twistedcaldav/directory/appleopendirectory.py	2009-10-02 17:34:48 UTC (rev 4568)
@@ -1105,7 +1105,6 @@
 
     def getMemcacheKey(self, shortName):
         key = "auth-%s" % (md5(shortName).hexdigest(),)
-        print shortName, key
         return key
 
     def verifyCredentials(self, credentials):
@@ -1130,7 +1129,7 @@
             try:
                 if opendirectory.authenticateUserBasic(self.service.directory, self.nodeName, self.shortName, credentials.password):
                     # Cache the password to avoid future DS queries
-                    self.password = md5(credentials.password).hexdigest()
+                    self.password = credPassword
                     key = self.getMemcacheKey(self.shortName)
                     self.service._getMemcacheClient().set(key, self.password, time=self.service.cacheTimeout*60)
                     return True
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091002/24af8f4f/attachment.html>