reopenldap: Merge branch 'master' into stable/1.1.

Change-Id: I5542f6c7faf3449674ec7d2cb8fb0f1aee753d47

.gitignore

@@ -1,23 +1,6 @@
 *~
 *.a
-aclocal.m4
 /autom4te.cache/
-*banner.c
-build/compile
-build/config.guess
-build/config.sub
-build/depcomp
-build/install-sh
-build/libltdl/
-build/ltmain.sh
-build/m4/libtool.m4
-build/m4/ltargz.m4
-build/m4/ltdl.m4
-build/m4/lt~obsolete.m4
-build/m4/ltoptions.m4
-build/m4/ltsugar.m4
-build/m4/ltversion.m4
-build/missing
 /clients/tools/ldapcompare
 /clients/tools/ldapdelete
 /clients/tools/ldapexop
@@ -31,7 +14,6 @@ build/missing
 /config.log
 /config.lt
 /config.status
-/configure
 configure.log
 .deps
 .dirstamp
@@ -41,6 +23,7 @@ docker/slapd.test.conf
 /include/lber_types.h
 /include/ldap_dirs.h
 /include/ldap_features.h
+INSTALL
 *.la
 libraries/liblunicode/ucgendat
 libraries/liblunicode/uctable.h
@@ -56,15 +39,12 @@ libtool
 .links
 *.lo
 Makefile
-Makefile.in
 *.man
-*.man.in
 *.o
 *.orig
 *.patch
 *.rej
 reldap_autoconf.h
-reldap_autoconf.h.in
 servers/slapd/back-bdb/.dirstamp
 servers/slapd/back-mdb/mdbx_chk
 servers/slapd/back-mdb/mdbx_copy

CHANGES.OpenLDAP

@@ -1,6 +1,46 @@
 OpenLDAP 2.4 Change Log
+	WFE = Was Fixed Earlier in ReOpenLDAP.
+	NA = Not Applicable for ReOpenLDAP.
 
 OpenLDAP 2.4.46 Engineering
+	Fixed libldap connection delete callbacks when TLS fails to start (ITS#8717)
+	Fixed libldap to not reuse tls_session if TLS hostname check fails (ITS#7373)
+	Fixed libldap cross-compiling with OpenSSL 1.1 (ITS#8687)
+	WFE: Fixed libldap OpenSSL 1.1.1 compatibility with BIO_method (ITS#8791)
+	WFE: Fixed libldap MozNSS CA certificate hash matching (ITS#7374)
+	WFE: Fixed libldap MozNSS with PEM certs when also using an NSS cert db (ITS#7389)
+	Fixed libldap MozNSS initialization (ITS#8484)
+	WFE: Fixed libldap GnuTLS with GNUTLS_E_AGAIN (ITS#8650)
+	Fixed libldap memory leak with cancel operations (ITS#8782)
+	NA: Fixed slapd Eventlog registry key creation on 64-bit Windows (ITS#8705)
+	Fixed slapd to maintain SSF across SASL binds (ITS#8796)
+	Fixed slapd syncrepl deadlock when updating cookie (ITS#8752)
+	Fixed slapd syncrepl callback to always be last in the stack (ITS#8752)
+	Fixed slapd telephoneNumberNormalize when the value is spaces and hyphens (ITS#8778)
+	Fixed slapd CSN queue processing (ITS#8801)
+	Fixed slapd-ldap TLS connection timeout with high latency connections (ITS#8720)
+	Fixed slapd-ldap to ignore unknown schema when omit-unknown-schema is set (ITS#7520)
+	Fixed slapd-mdb with an optimization for long lived read transactions (ITS#8226)
+	Fixed slapd-meta assert when olcDbRewrite is modified (ITS#8404)
+	Fixed slapd-sock with LDAP_MOD_INCREMENT operations (ITS#8692)
+	Fixed slapo-accesslog cleanup to only occur on failed operations (ITS#8752)
+	Fixed slapo-dds entryTTL to actually decrease as per RFC 2589 (ITS#7100)
+	WFE: Fixed slapo-syncprov memory leak with delete operations (ITS#8690)
+	Fixed slapo-syncprov to not clear pending operation when checkpointing (ITS#8444)
+	Fixed slapo-syncprov to correctly record contextCSN values in the accesslog (ITS#8100)
+	Fixed slapo-syncprov not to log checkpoints to accesslog db (ITS#8607)
+	WFE: Fixed slapo-syncprov to process changes from this SID on REFRESH (ITS#8800)
+	Fixed slapo-syncprov session log parsing to not block other operations (ITS#8486)
+	Build Environment
+		NA: Fixed Windows build with newer MINGW version (ITS#8697)
+		WFE: Fixed compiler warnings and removed unused variables (ITS#8578)
+	Contrib
+		NA: Fixed ldapc++ Control structure (ITS#8583)
+	Documentation
+		Delete stub manpage for back-ldbm (ITS#8713)
+		Fixed ldap_bind(3) to mention the LDAP_SASL_SIMPLE mechanism (ITS#8121)
+		Fixed slapd-config(5) typo for olcTLSCipherSuite (ITS#8715)
+		Fixed slapo-syncprov(5) indexing requirements (ITS#5048)
 
 OpenLDAP 2.4.45 Release (2017/06/01)
 	Added slapd support for OpenSSL 1.1.0 series (ITS#8353, ITS#8533, ITS#8634)
@@ -14,16 +54,16 @@ OpenLDAP 2.4.45 Release (2017/06/01)
 	Fixed slapd sasl SEGV rebind in same session (ITS#8568)
 	Fixed slapd syncrepl filter handling (ITS#8413)
 	Fixed slapd syncrepl infinite looping mods with delta-sync MMR (ITS#8432)
-	Fixed slapd callback struct so older modules without writewait should function (already fixed in ReOpenLDAP).
-		Custom modules may need to be updated for sc_writewait callback (ITS#8435, already fixed in ReOpenLDAP)
+	WFE: Fixed slapd callback struct so older modules without writewait should function
+		WFE: Custom modules may need to be updated for sc_writewait callback (ITS#8435)
 	Fixed slapd-ldap/meta broken LDAP_TAILQ macro (ITS#8576)
-	Fixed slapd-mdb so it passes ITS6794 regression test (ITS#6794, already fixed in ReOpenLDAP)
+	WFE: Fixed slapd-mdb so it passes ITS6794 regression test (ITS#6794)
 	Fixed slapd-mdb double free with size zero paged result (ITS#8655)
-	Fixed slapd-meta uninitialized diagnostic message (ITS#8442, already fixed in ReOpenLDAP)
+	WFE: Fixed slapd-meta uninitialized diagnostic message (ITS#8442)
 	Fixed slapo-accesslog to honor pauses during purge for cn=config update (ITS#8423)
 	Fixed slapo-accesslog with multiple modifications to the same attribute (ITS#6545)
-	Fixed slapo-relay to correctly initialize sc_writewait (ITS#8428, already fixed in ReOpenLDAP)
-	Fixed slapo-sssvlv double free (ITS#8592, already fixed in ReOpenLDAP)
+	WFE: Fixed slapo-relay to correctly initialize sc_writewait (ITS#8428)
+	WFE: Fixed slapo-sssvlv double free (ITS#8592)
 	Fixed slapo-unique with empty modifications (ITS#8266)
 	Build Environment
 		Added test065 for proxyauthz (ITS#8571)
@@ -35,17 +75,17 @@ OpenLDAP 2.4.45 Release (2017/06/01)
 	Contrib
 		Added slapo-autogroup(5) man page (ITS#8569)
 		Added passwd missing conversion scripts for apr1 (ITS#6826)
-		Fixed contrib modules where the writewait callback was not correctly initialized (ITS#8435, already fixed in ReOpenLDAP)
-		Fixed smbk5pwd to build with newer OpenSSL releases (ITS#8525, already fixed in ReOpenLDAP)
+		WFE: Fixed contrib modules where the writewait callback was not correctly initialized (ITS#8435)
+		WFE: Fixed smbk5pwd to build with newer OpenSSL releases (ITS#8525)
 	Documentation
-		admin24 fixed tls_cipher_suite bindconf option (ITS#8099)
-		admin24 fixed typo cn=config to be slapd.d (ITS#8449)
-		admin24 fixed slapo-syncprov information to be current (ITS#8253)
-		admin24 fixed typo in access control docs (ITS#7341, ITS#8391)
-		admin24 fixed minor typo in tuning guide (ITS#8499)
-		admin24 fixed information about the limits option (ITS#7700)
-		admin24 fixed missing options for syncrepl configuration (ITS#7700)
-		admin24 fixed accesslog documentation to note it should not be replicated (ITS#8344)
+		NA: admin24 fixed tls_cipher_suite bindconf option (ITS#8099)
+		NA: admin24 fixed typo cn=config to be slapd.d (ITS#8449)
+		NA: admin24 fixed slapo-syncprov information to be current (ITS#8253)
+		NA: admin24 fixed typo in access control docs (ITS#7341, ITS#8391)
+		NA: admin24 fixed minor typo in tuning guide (ITS#8499)
+		NA: admin24 fixed information about the limits option (ITS#7700)
+		NA: admin24 fixed missing options for syncrepl configuration (ITS#7700)
+		NA: admin24 fixed accesslog documentation to note it should not be replicated (ITS#8344)
 		Fixed ldap.conf(5) missing information on SASL_NOCANON option (ITS#7177)
 		Fixed ldapsearch(1) information on the V[V] flag behavior (ITS#7177, ITS#6339)
 		Fixed slapd-config(5), slapd.conf(5) clarification on interval keyword for refreshAndPersist (ITS#8538)
@@ -65,18 +105,18 @@ OpenLDAP 2.4.44 Release (2016/02/05)
 	Fixed slapd-sql missing id_query/olcSqlIdQuery (ITS#8329)
 	Fixed slapo-accesslog callback initialization (ITS#8351)
 	Fixed slapo-ppolicy pwdMaxRecordedFailure must never be zero (ITS#8327)
-	already fixed in ReOpenLDAP - slapo-syncprov segfault on abandon (ITS#8354)
+	WFE: slapo-syncprov segfault on abandon (ITS#8354)
 	partial fixes - support for OpenSSL 1.1.X (ITS#8353)
-	Fixed slapo-syncprov abandon processing (ITS#8354, already fixed in ReOpenLDAP)
-	Fixed slapo-syncprov ctxcsn snapshot on refresh (ITS#8281, ITS#8365, already fixed in ReOpenLDAP)
+	WFE: Fixed slapo-syncprov abandon processing (ITS#8354)
+	WFE: Fixed slapo-syncprov ctxcsn snapshot on refresh (ITS#8281, ITS#8365)
 	Documentation
-		admin24 Stop linking to Berkeley DB downloads (ITS#8362)
-		admin24 Update documentation for LMDB preference
+		NA: admin24 Stop linking to Berkeley DB downloads (ITS#8362)
+		NA: admin24 Update documentation for LMDB preference
 
 OpenLDAP 2.4.43 Release (2015/11/30)
 	Fixed liblber remove obsolete assert (ITS#8240, ITS#8301)
-	Fixed libldap file URLs on windows (ITS#8273)
-	Fixed libldap microsecond timer for windows (ITS#8295)
+	NA: Fixed libldap file URLs on windows (ITS#8273)
+	NA: Fixed libldap microsecond timer for windows (ITS#8295)
 	Fixed slap tools minor one time memory leak (ITS#8082)
 	Fixed slapd to avoid redundant processing of abandon ops (ITS#8232)
 	Fixed slapd syncrepl segv when present list is NULL (ITS#8231, ITS#8042)
@@ -99,8 +139,8 @@ OpenLDAP 2.4.43 Release (2015/11/30)
 	Fixed slapo-rwm parsing to avoid double-escaping rewrite rules (ITS#7964)
 	Build Environment
 		Fixed ldif-filter option parsing (ITS#8292)
-		Fixed slapd-tester EOL handling in test output for windows (ITS#8280)
-		Fixed slapd-tester executable suffix for windows (ITS#8216)
+		NA: Fixed slapd-tester EOL handling in test output for windows (ITS#8280)
+		NA: Fixed slapd-tester executable suffix for windows (ITS#8216)
 		Fixed test061 timing issues (ITS#8297)
 	Contrib
 		Added libnettle support to pw-pbkdf2 (ITS#8198)