[Pkg-openldap-devel] [openldap] 206/208: Merge tag 'upstream/2.4.43+dfsg'

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit fb5a9a9a25d0a53c6d763c18f9a1effce26c9b6e
Merge: 9867332 561fcd5
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Thu Dec 31 14:05:57 2015 -0800

    Merge tag 'upstream/2.4.43+dfsg'
    
    Upstream version 2.4.43+dfsg
    
    # gpg: Signature made Thu 31 Dec 2015 02:05:53 PM PST
    # gpg:                using RSA key 0x229FCF12F5D66BB6
    # gpg: Good signature from "Ryan Tandy <ryan at nardis.ca>" [ultimate]
    # gpg:                 aka "Ryan Tandy <rtandy at sd63.bc.ca>" [ultimate]
    # gpg:                 aka "Ryan Tandy <rtandy at uvic.ca>" [ultimate]

 CHANGES                                          |   36 +
 build/version.var                                |    8 +-
 contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c  |  112 +-
 contrib/slapd-modules/passwd/sha2/sha2.c         |    6 +-
 contrib/slapd-modules/passwd/sha2/sha2.h         |   19 +
 contrib/slapd-modules/smbk5pwd/smbk5pwd.c        |   29 +-
 doc/guide/admin/backends.sdf                     |    4 +-
 doc/guide/admin/guide.html                       |   10 +-
 doc/guide/admin/slapdconf2.sdf                   |    6 +-
 doc/guide/admin/slapdconfig.sdf                  |    6 +-
 doc/man/man5/slapd-null.5                        |    5 +
 doc/man/man5/slapo-ppolicy.5                     |   23 +-
 include/ldap_pvt.h                               |    7 +
 libraries/liblber/io.c                           |    5 +-
 libraries/libldap/add.c                          |  120 +-
 libraries/libldap/compare.c                      |   74 +-
 libraries/libldap/delete.c                       |   68 +-
 libraries/libldap/extended.c                     |   89 +-
 libraries/libldap/fetch.c                        |   17 +-
 libraries/libldap/ldap-int.h                     |   85 ++
 libraries/libldap/modify.c                       |  106 +-
 libraries/libldap/modrdn.c                       |   85 +-
 libraries/libldap/sasl.c                         |   90 +-
 libraries/libldap/util-int.c                     |  187 ++-
 libraries/liblmdb/CHANGES                        |   37 +
 libraries/liblmdb/Makefile                       |   11 +-
 libraries/liblmdb/lmdb.h                         |   40 +-
 libraries/liblmdb/mdb.c                          | 1521 ++++++++++++++--------
 libraries/liblmdb/mdb_dump.1                     |    2 +-
 libraries/liblmdb/mdb_dump.c                     |    2 +-
 libraries/liblmdb/mdb_load.1                     |    2 +-
 libraries/liblmdb/mdb_load.c                     |   18 +-
 libraries/liblmdb/mdb_stat.1                     |    2 +-
 libraries/liblmdb/mdb_stat.c                     |    2 +-
 servers/slapd/back-ldap/bind.c                   |    2 +
 servers/slapd/back-ldap/search.c                 |   30 +-
 servers/slapd/back-null/null.c                   |  100 +-
 servers/slapd/back-relay/init.c                  |    2 +-
 servers/slapd/config.c                           |   28 +-
 servers/slapd/config.h                           |    1 +
 servers/slapd/connection.c                       |    3 +
 servers/slapd/controls.c                         |    1 +
 servers/slapd/ctxcsn.c                           |    4 +-
 servers/slapd/mods.c                             |    6 +-
 servers/slapd/overlays/accesslog.c               |   49 +-
 servers/slapd/overlays/dds.c                     |   12 -
 servers/slapd/overlays/ppolicy.c                 |   88 +-
 servers/slapd/overlays/refint.c                  |  162 ++-
 servers/slapd/overlays/rwm.c                     |   21 +-
 servers/slapd/overlays/syncprov.c                |   44 +-
 servers/slapd/proto-slap.h                       |    2 +-
 servers/slapd/saslauthz.c                        |    5 +-
 servers/slapd/schema/ppolicy.ldif                |    5 +-
 servers/slapd/sl_malloc.c                        |    7 +-
 servers/slapd/syncrepl.c                         |    5 +-
 tests/progs/ldif-filter.c                        |   22 +-
 tests/progs/slapd-tester.c                       |   18 +-
 tests/scripts/test043-delta-syncrepl             |   10 +-
 tests/scripts/test061-syncreplication-initiation |    1 +
 tests/scripts/test063-delta-multimaster          |    2 +-
 60 files changed, 2385 insertions(+), 1079 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git