Merge in Normalized DN bug fixes and optimizations from devel.

[openldap] / CHANGES

diff --git a/CHANGES b/CHANGES
index 0b7549afaf48cbf08854c89cf37ef748bd5c742f..58be0030172a7262f8ca874da0d8a59d0b9a4cdd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,14 @@ OpenLDAP Change Log
 
 Changes included in OpenLDAP 1.2
        CVS Tag: OPENLDAP_REL_ENG_1_2
+       Add ldappasswd() tool
+       Add salted MD5/SHA1 password support
+       Add client/tools password prompting (-W)
+       Add slapd logging option
+       Add slapd alternative args/pid file locations
+       Fix lber leaking ber_scanf
+       Update slapd alias deref functionality to be optional
+       Update client/tools Kerberos option handling
 
 Changes included in OpenLDAP 1.1.3
        CVS Tag: OPENLDAP_REL_ENG_1_1_3
@@ -22,6 +30,7 @@ Changes included in OpenLDAP 1.1.3
        Updated slapd to use pthread_detach()
        Updated slapd thread initialization
        Updated slapd shutdown code to use condition wait
+       Updated slapd alias deref to be optional
        Build environment
                Added DB2 patch information
                Added distclean target