[Tickets #3739] RESOLVED: customsql auth driver does not work with encryption schemes using salt

[bugs@bugs.horde.org]

DO NOT REPLY TO THIS MESSAGE. THIS EMAIL ADDRESS IS NOT MONITORED.

Ticket URL: http://bugs.horde.org/ticket/?id=3739
-----------------------------------------------------------------------
 Ticket             | 3739
 Updated By         | dorm at dorm.org
 Summary            | customsql auth driver does not work with encryption schemes using salt
 Queue              | Horde Framework Packages
 Version            | HEAD
 State              | Resolved
 Priority           | 1. Low
 Type               | Bug
 Owners             | Chuck Hagenbuch, Horde Developers
-----------------------------------------------------------------------


dorm at dorm.org (2006-05-23 09:06) wrote:

Looks good, but I think there are a couple typos.  See patch below.

--- customsql.php.1.24  2006-05-23 09:43:00.636912864 -0600
+++ customsql.php       2006-05-23 09:48:52.369441392 -0600
@@ -113,7 +113,7 @@
         $query = str_replace('\L', $this->_db->quote($userId), $query);
         $query = str_replace('\P',
$this->_db->quote($this->getCryptedPassword(
                                                         
$credentials['password'],
-                                                        
$this->_getPassword(),
+                                                        
$this->_getPassword($userId),
                                                         
$this->_params['encryption'],
                                                         
$this->_params['show_encryption'])), $query);
 
@@ -298,7 +298,7 @@
     {
         /* Retrieve the old password in case we need the salt. */
         $query = $this->_params['query_getpw'];
-        $query = str_replace('\L', $this->_db->quote($oldID), $query);
+        $query = str_replace('\L', $this->_db->quote($userId), $query);
         $pw = $this->_db->getOne($query);
         if (is_a($pw, 'PEAR_Error')) {
             Horde::logMessage($pw, __FILE__, __LINE__, PEAR_LOG_ERR);