[Pkg-openldap-devel] [openldap] 330/339: Merge tag 'upstream/2.4.40'
Ryan Tandy
rtandy-guest at moszumanska.debian.org
Sun Oct 19 22:47:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
rtandy-guest pushed a commit to branch master
in repository openldap.
commit 04670119bf4e2929ae9fa7f7ded628e34139415f
Merge: f7b97db 9f921b9
Author: Ryan Tandy <ryan at nardis.ca>
Date: Wed Oct 1 03:46:48 2014 +0000
Merge tag 'upstream/2.4.40'
Upstream version 2.4.40
Conflicts:
configure.in
debian/schema/core.ldif
debian/schema/core.schema
debian/schema/duaconf.schema
debian/schema/pmi.schema
doc/guide/admin/guide.html
CHANGES | 79 +-
build/openldap.m4 | 12 +-
build/version.var | 8 +-
clients/tools/common.c | 2 +-
configure | 33 +-
configure.in | 11 +-
contrib/ldapc++/src/LDAPAsynConnection.cpp | 10 +-
contrib/slapd-modules/autogroup/autogroup.c | 187 +-
contrib/slapd-modules/nssov/Makefile | 2 +-
contrib/slapd-modules/passwd/Makefile | 8 +-
contrib/slapd-modules/passwd/apr1.c | 466 ++---
contrib/slapd-modules/passwd/{ => pbkdf2}/Makefile | 36 +-
contrib/slapd-modules/passwd/pbkdf2/README | 87 +
contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c | 295 +++
contrib/slapd-modules/passwd/sha2/slapd-sha2.c | 54 +-
contrib/slapd-modules/smbk5pwd/smbk5pwd.c | 34 +-
doc/guide/admin/appendix-recommended-versions.sdf | 11 +-
doc/guide/admin/guide.html | 99 +-
doc/guide/admin/install.sdf | 11 +-
doc/guide/preamble.sdf | 1 +
doc/man/man3/ldap_get_dn.3 | 4 +-
doc/man/man5/slapd-bdb.5 | 7 +-
doc/man/man5/slapd-mdb.5 | 6 +-
doc/man/man5/slapd.conf.5 | 14 +
doc/man/man8/slapcat.8 | 4 +-
include/lutil_meter.h | 8 +-
libraries/libldap/dnssrv.c | 145 +-
libraries/libldap/ldif.c | 57 +-
libraries/libldap/tls_g.c | 217 +--
libraries/liblmdb/CHANGES | 35 +
libraries/liblmdb/COPYRIGHT | 2 +-
libraries/liblmdb/Doxyfile | 4 +-
libraries/liblmdb/Makefile | 27 +-
libraries/liblmdb/lmdb.h | 182 +-
libraries/liblmdb/mdb.c | 1968 ++++++++++++++------
libraries/liblmdb/mdb_copy.1 | 17 +-
libraries/liblmdb/mdb_copy.c | 16 +-
libraries/liblmdb/mdb_dump.1 | 75 +
libraries/liblmdb/mdb_dump.c | 317 ++++
libraries/liblmdb/mdb_load.1 | 77 +
libraries/liblmdb/mdb_load.c | 452 +++++
libraries/liblmdb/mdb_stat.1 | 9 +-
libraries/liblmdb/mdb_stat.c | 33 +-
libraries/liblmdb/midl.c | 16 +-
libraries/liblmdb/midl.h | 13 +-
libraries/liblmdb/mtest.c | 95 +-
libraries/liblmdb/mtest2.c | 56 +-
libraries/liblmdb/mtest3.c | 56 +-
libraries/liblmdb/mtest4.c | 69 +-
libraries/liblmdb/mtest5.c | 58 +-
libraries/liblmdb/mtest6.c | 54 +-
libraries/liblmdb/{sample-bdb.c => sample-bdb.txt} | 6 +-
libraries/liblmdb/{sample-mdb.c => sample-mdb.txt} | 6 +-
libraries/liblmdb/tooltag | 22 +
libraries/liblutil/meter.c | 4 +-
libraries/liblutil/passwd.c | 32 +-
libraries/librewrite/session.c | 2 +
servers/slapd/ad.c | 1 +
servers/slapd/back-ldap/chain.c | 22 +-
servers/slapd/back-ldap/modify.c | 4 -
servers/slapd/back-mdb/attr.c | 2 +-
servers/slapd/back-mdb/config.c | 32 +-
servers/slapd/back-mdb/dn2entry.c | 2 +
servers/slapd/back-mdb/dn2id.c | 65 +-
servers/slapd/back-mdb/id2entry.c | 62 +-
servers/slapd/back-mdb/idl.h | 1 +
servers/slapd/back-mdb/init.c | 21 +-
servers/slapd/back-mdb/proto-mdb.h | 6 +-
servers/slapd/back-mdb/search.c | 159 +-
servers/slapd/back-mdb/tools.c | 84 +-
servers/slapd/back-sock/config.c | 2 +
servers/slapd/back-sock/result.c | 1 +
servers/slapd/bconfig.c | 16 +-
servers/slapd/config.c | 16 +-
servers/slapd/config.h | 2 +-
servers/slapd/controls.c | 23 +
servers/slapd/ctxcsn.c | 2 +-
servers/slapd/entry.c | 72 +-
servers/slapd/modrdn.c | 13 +-
servers/slapd/overlays/accesslog.c | 15 +-
servers/slapd/overlays/auditlog.c | 16 +-
servers/slapd/overlays/constraint.c | 4 +-
servers/slapd/overlays/dds.c | 1 +
servers/slapd/overlays/dyngroup.c | 4 +-
servers/slapd/overlays/memberof.c | 23 +-
servers/slapd/overlays/pcache.c | 54 +-
servers/slapd/overlays/ppolicy.c | 59 +-
servers/slapd/overlays/refint.c | 65 +-
servers/slapd/overlays/rwm.c | 2 +-
servers/slapd/overlays/seqmod.c | 1 +
servers/slapd/overlays/slapover.txt | 6 +
servers/slapd/overlays/sssvlv.c | 2 +-
servers/slapd/overlays/syncprov.c | 2 +-
servers/slapd/overlays/translucent.c | 14 +-
servers/slapd/overlays/unique.c | 43 -
servers/slapd/result.c | 17 +
servers/slapd/schema/ppolicy.ldif | 31 +-
servers/slapd/slap.h | 4 +
servers/slapd/slapadd.c | 4 +-
servers/slapd/slapcommon.c | 10 +-
servers/slapd/slapd.ldif | 11 +-
servers/slapd/syncrepl.c | 4 +
102 files changed, 4706 insertions(+), 1905 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git
More information about the Pkg-openldap-devel
mailing list