doc/man/man8/slapd.8 | 17 8 + 9 - 0 !
1 file changed, 8 insertions(+), 9 deletions(-)

---

include/ldap.h | 20 20 + 0 - 0 !
libraries/libldap/Makefile.in | 4 2 + 2 - 0 !
libraries/libldap/ntlm.c | 138 138 + 0 - 0 !
libraries/libldap_r/Makefile.in | 4 2 + 2 - 0 !
4 files changed, 162 insertions(+), 4 deletions(-)

---

servers/slapd/slapi/slapi_overlay.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

include/ldap_defaults.h | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

doc/man/man5/slapd-bdb.5 | 2 1 + 1 - 0 !
doc/man/man5/slapd-config.5 | 2 1 + 1 - 0 !
doc/man/man5/slapd-mdb.5 | 2 1 + 1 - 0 !
doc/man/man5/slapd.conf.5 | 2 1 + 1 - 0 !
include/ldap_defaults.h | 2 1 + 1 - 0 !
servers/slapd/Makefile.in | 4 2 + 2 - 0 !
6 files changed, 7 insertions(+), 7 deletions(-)

---

doc/man/man8/slapindex.8 | 4 4 + 0 - 0 !
servers/slapd/slapindex.c | 2 2 + 0 - 0 !
2 files changed, 6 insertions(+)

---

include/ldap_defaults.h | 2 2 + 0 - 0 !
servers/slapd/sasl.c | 26 26 + 0 - 0 !
2 files changed, 28 insertions(+)

---

build/openldap.m4 | 51 51 + 0 - 0 !
build/top.mk | 5 4 + 1 - 0 !
configure.in | 7 7 + 0 - 0 !
libraries/liblber/Makefile.in | 3 3 + 0 - 0 !
libraries/liblber/liblber.map | 8 8 + 0 - 0 !
libraries/libldap/Makefile.in | 3 3 + 0 - 0 !
libraries/libldap/libldap.map | 7 7 + 0 - 0 !
libraries/libldap_r/Makefile.in | 3 3 + 0 - 0 !
8 files changed, 86 insertions(+), 1 deletion(-)

---

libraries/libldap/os-ip.c | 6 0 + 6 - 0 !
libraries/libldap/util-int.c | 2 0 + 2 - 0 !
2 files changed, 8 deletions(-)

---

libraries/libldap/cyrus.c | 22 0 + 22 - 0 !
servers/slapd/sasl.c | 20 0 + 20 - 0 !
2 files changed, 42 deletions(-)

---

contrib/slapd-modules/autogroup/Makefile | 4 2 + 2 - 0 !
contrib/slapd-modules/lastbind/Makefile | 4 2 + 2 - 0 !
contrib/slapd-modules/passwd/sha2/Makefile | 4 2 + 2 - 0 !
contrib/slapd-modules/smbk5pwd/Makefile | 4 2 + 2 - 0 !
4 files changed, 8 insertions(+), 8 deletions(-)

 pass cflags to contrib builds
 $(CFLAGS) is missing from the compiler invocations for autogroup and
 smbk5pwd, which means they're not being hardened.

contrib/slapd-modules/smbk5pwd/Makefile | 25 13 + 12 - 0 !
1 file changed, 13 insertions(+), 12 deletions(-)

---

contrib/slapd-modules/smbk5pwd/Makefile | 14 13 + 1 - 0 !
contrib/slapd-modules/smbk5pwd/slapo-smbk5pwd.5 | 179 179 + 0 - 0 !
2 files changed, 192 insertions(+), 1 deletion(-)

 [patch] contrib/smbk5pwd: add man page, install it too

Add a manual page slapo-smbk5pwd.5 and update smbk5pwd's Makefile to
install the new manual page.

This patch is derived from the corresponding patch upstreamed in ITS#8205

contrib/slapd-modules/autogroup/Makefile | 14 7 + 7 - 0 !
1 file changed, 7 insertions(+), 7 deletions(-)

---

contrib/slapd-modules/lastbind/Makefile | 14 7 + 7 - 0 !
1 file changed, 7 insertions(+), 7 deletions(-)

---

contrib/slapd-modules/lastbind/Makefile | 14 13 + 1 - 0 !
1 file changed, 13 insertions(+), 1 deletion(-)

---

contrib/slapd-modules/passwd/sha2/Makefile | 14 7 + 7 - 0 !
1 file changed, 7 insertions(+), 7 deletions(-)

---

doc/man/man5/ldap.conf.5 | 6 3 + 3 - 0 !
1 file changed, 3 insertions(+), 3 deletions(-)

---

libraries/libldap/ldap.conf | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

---

build/top.mk | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

configure.in | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 don't use am_init_automake macro when we aren't using automake
 Calling AM_INIT_AUTOMAKE() in configure.in serves no purpose if we're not
 using automake, and it confuses autoreconf.  Use AC_INIT() instead.

servers/slapd/module.c | 16 15 + 1 - 0 !
1 file changed, 15 insertions(+), 1 deletion(-)

 switch to lt_dlopenadvise() so back_perl can be opened with rtld_global.    
 Open all modules with RTLD_GLOBAL, needed so that back_perl can load
 non-trivial Perl extensions that require symbols from back_perl.so itself.
Bug-Debian: http://bugs.debian.org/327585

servers/slapd/back-bdb/init.c | 13 1 + 12 - 0 !
1 file changed, 1 insertion(+), 12 deletions(-)

 don't second-guess bdb abi
 OpenLDAP upstream conservatively assumes that any change to the version
 number of libdb can result in an API-breaking change that could impact
 the database.  In Debian, we know that such changes require bumping the
 library soname and changing the package name, and demand such rigor from
 our package maintainers even when upstreams don't deliver; so any such
 check in the source code works against the packaging system by forcing
 database upgrades when we know none are required.  Disable this check
 so we rely on the packaging system to do its job.
Bug-Debian: http://bugs.debian.org/651333

contrib/slapd-modules/smbk5pwd/smbk5pwd.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 adapt parameters of hdb_generate_key_set_password() to heimdal 1.6~git20120311
 .
 With version heimdal 1.6~git20120311 heimdal schanged the number of parameters
 of function hdb_generate_key_set_password(), implementing a fallback to "default"
 values when NULL-values are passed for these parameters.
 .
 This patch does exactly that.
 .
Bug-Debian: 664930

doc/man/man5/slapd-config.5 | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

---

build/mkversion | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

libraries/liblmdb/mdb.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 [patch] its#8554 kfreebsd is like bsd

Doesn't have POSIX robust mutexes - GNU userland on BSD kernel

tests/scripts/test064-constraint | 17 17 + 0 - 0 !
1 file changed, 17 insertions(+)

 [patch] its#8644 wait for slapd to start in test064

servers/slapd/back-mdb/search.c | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 [patch] its#8655 fix double free on paged search with pagesize 0

Fixes a double free when a search includes the Paged Results control
with a page size of 0 and the search base matches the filter.

libraries/libldap/tls_g.c | 18 10 + 8 - 0 !
1 file changed, 10 insertions(+), 8 deletions(-)

 [patch] its#8385 fix use-after-free with gnutls

servers/slapd/syncrepl.c | 32 32 + 0 - 0 !
1 file changed, 32 insertions(+)

 [patch] its#8432 fix infinite looping mods in delta-mmr

libraries/libldap/options.c | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 [patch] its#8648 check result of ldap_int_initialize in
 ldap_{get,set}_option

libraries/libldap/cyrus.c | 17 3 + 14 - 0 !
libraries/libldap/init.c | 6 6 + 0 - 0 !
2 files changed, 9 insertions(+), 14 deletions(-)

 [patch] its#8648 init sasl library in global init