Import op -> slap_op , conn -> slap_conn change from rel eng 1.1.

[openldap] / CHANGES

diff --git a/CHANGES b/CHANGES
index f00100a3464b781d2aa8ffc0be32fa72f5aa1441..e44f2c9f6d2ed3edc6a48bd555b58a33ef72ab40 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,18 @@
 OpenLDAP Change Log
 
-Changes included in OpenLDAP 1.1.x
-       CVS Tag: OPENLDAP_REL_ENG_1_1
+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
        Updated LICENSE to allow open use of linked software
        Updated docs
        Fixed slapd/ldbm/delete initialization bug (ITS#31)
@@ -22,6 +33,7 @@ Changes included in OpenLDAP 1.1.x
        Build environment
                Added DB2 patch information
                Added distclean target
+               Added pthread sys/types.h compatibility check
                Fixed doc/man reinstall bug
                Fixed make clean
                Fixed --disable-slurpd