ITS#464: fix multiple userPassword support

diff --git a/CHANGES b/CHANGES
index 94b623289668a119586892aa6aa33c9b3a8c8ac0..63323e4409d6c3177fbe99813052725231eadfd8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,8 @@ Changes included in OpenLDAP 1.2.10 Release Engineering
        CVS Tag: OPENLDAP_REL_ENG_1_2
        Add slapd -DSLAPD_UNDEFINED_OC_IS_NOT_EXTENSIBLE macro disable
                undefined object classes implies extensible object behavior.
+       Changed -lldap to ignore space in filter: ( !(foo=bar)) (ITS#459)
+       Fixed multiple password support (ITS#464)
        Build Environment
                Do not list unsupported LDBM API option NDBM
 

diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c
index 629eaf846b43033625c3b847c5973a42179c60c7..43ad93c6b5a1f900b0182bc7b4a50d196731fea9 100644 (file)
--- a/servers/slapd/back-ldbm/bind.c
+++ b/servers/slapd/back-ldbm/bind.c
@@ -45,7 +45,8 @@ crypted_value_find(
                        ldap_pvt_thread_mutex_unlock( &crypt_mutex );
 #endif
 
-                       return result;
+                       if( !result )
+                               return result;
 
                } else {
                 if ( value_cmp( vals[i], v, syntax, normalize ) == 0 ) {