Ready for release

diff --git a/CHANGES b/CHANGES
index 4b71a4b5f121d6a5f98db7232cf8e4e736dd5300..ebf47b7f408722d1b6e69b2851555fcc01062484 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,19 @@
 OpenLDAP 2.1 Change Log
 
-OpenLDAP 2.1.3 Engineering
+OpenLDAP 2.1.3 Release
        Fixed slapd structuralObjectClass lastmod bug (ITS#1904)
        Fixed slapd krbName bug (ITS#1913)
        Fixed slapd schema error alignment bug
        Fixed slapd excessive DN logging (ITS#1901)
        Fixed slapd matched values malloc bug (ITS#1931)
+       Fixed slapd TLS data ready bug
        Updated slapd SASL proxy policy code
        Updated slapd require "strong" check
        Added slapd disallow bind_simple_unprotected directive
        Added slapd SASL setpass support
        Added slapd IPv4/v6 only options
        Updated back-bdb entry locking
+       Fixed liblutil passwd cleartext bug
        Fixed back-ldap/meta mapping bug (ITS#1787)
        Added back-monitor added monitorContext support
        Fixed back-perl ad_cname bug (ITS#1882)

diff --git a/build/version.sh b/build/version.sh
index fdf427994dd5009be55676843ac7f82a6ffafb9e..ec2c5192b5a6d348f33fafed087d444240ed53c7 100755 (executable)
--- a/build/version.sh
+++ b/build/version.sh
@@ -7,9 +7,9 @@
 ol_package=OpenLDAP
 ol_major=2
 ol_minor=1
-ol_patch=X
-ol_api_inc=20102
-ol_api_lib=2:102:0
+ol_patch=3
+ol_api_inc=20103
+ol_api_lib=2:103:0
 
 if test $ol_patch != X ; then
        ol_version=${ol_major}.${ol_minor}.${ol_patch}

diff --git a/libraries/liblutil/passwd.c b/libraries/liblutil/passwd.c
index 7a04154b98d65787e16778a9102f104214414223..3fc5e6f455e587f410216f282fc498d9fe3a60a6 100644 (file)
--- a/libraries/liblutil/passwd.c
+++ b/libraries/liblutil/passwd.c
@@ -328,7 +328,8 @@ lutil_passwd(
 
 #ifdef SLAPD_CLEARTEXT
        if( is_allowed_scheme("{CLEARTEXT}", schemes ) ) {
-               return passwd->bv_len == cred->bv_len
+               return (( passwd->bv_len == cred->bv_len ) &&
+                               ( passwd->bv_val[0] != '{' /*'}'*/ ))
                        ? memcmp( passwd->bv_val, cred->bv_val, passwd->bv_len )
                        : 1;
        }