Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/openldap Merge openldap-2.5.6.



details:   https://anonhg.NetBSD.org/src/rev/4291e061e8c5
branches:  trunk
changeset: 985223:4291e061e8c5
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Aug 14 16:14:49 2021 +0000

description:
Merge openldap-2.5.6.

diffstat:

 external/bsd/openldap/bin/Makefile.inc                                               |    13 +-
 external/bsd/openldap/dist/build/mkversion                                           |     6 +-
 external/bsd/openldap/dist/build/version.h                                           |     6 +-
 external/bsd/openldap/dist/clients/tools/common.c                                    |   826 +-
 external/bsd/openldap/dist/clients/tools/common.h                                    |    10 +-
 external/bsd/openldap/dist/clients/tools/ldapcompare.c                               |     8 +-
 external/bsd/openldap/dist/clients/tools/ldapdelete.c                                |    10 +-
 external/bsd/openldap/dist/clients/tools/ldapexop.c                                  |     8 +-
 external/bsd/openldap/dist/clients/tools/ldapmodify.c                                |   741 +-
 external/bsd/openldap/dist/clients/tools/ldapmodrdn.c                                |    10 +-
 external/bsd/openldap/dist/clients/tools/ldappasswd.c                                |    10 +-
 external/bsd/openldap/dist/clients/tools/ldapsearch.c                                |   552 +-
 external/bsd/openldap/dist/clients/tools/ldapurl.c                                   |     7 +-
 external/bsd/openldap/dist/clients/tools/ldapvc.c                                    |     4 +-
 external/bsd/openldap/dist/clients/tools/ldapwhoami.c                                |     8 +-
 external/bsd/openldap/dist/configure.in                                              |  3339 ------
 external/bsd/openldap/dist/contrib/ldapc++/configure.in                              |   101 -
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAddRequest.h                      |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAsynConnection.h                  |    30 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAttrType.h                        |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAttribute.h                       |     6 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPAttributeList.h                   |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPBindRequest.h                     |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPCompareRequest.h                  |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPConnection.h                      |    30 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPConstraints.h                     |     6 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPControl.h                         |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPControlSet.h                      |     8 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPDeleteRequest.h                   |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPEntry.h                           |     6 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPEntryList.h                       |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPException.h                       |    12 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPExtRequest.h                      |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPExtResult.h                       |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPMessage.h                         |     8 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPMessageQueue.h                    |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModDNRequest.h                    |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModList.h                         |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModification.h                    |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPModifyRequest.h                   |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPObjClass.h                        |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPRebind.h                          |     6 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPRebindAuth.h                      |     6 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPReferenceList.h                   |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPRequest.h                         |     8 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPResult.h                          |    10 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSaslBindResult.h                  |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSchema.h                          |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchReference.h                 |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchRequest.h                   |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchResult.h                    |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPSearchResults.h                   |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPUrl.h                             |    10 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LDAPUrlList.h                         |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LdifReader.h                          |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/LdifWriter.h                          |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/SaslInteraction.h                     |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/SaslInteractionHandler.h              |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/StringList.h                          |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/TlsOptions.h                          |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/ac/time.h                             |     4 +-
 external/bsd/openldap/dist/contrib/ldapc++/src/debug.h                               |     4 +-
 external/bsd/openldap/dist/contrib/ldaptcl/configure.in                              |   218 -
 external/bsd/openldap/dist/contrib/ldaptcl/neoXldap.c                                |     2 +-
 external/bsd/openldap/dist/contrib/ldaptcl/tclAppInit.c                              |     2 +-
 external/bsd/openldap/dist/contrib/ldaptcl/tkAppInit.c                               |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/acl/gssacl.c                        |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/acl/posixgroup.c                    |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/addpartial/addpartial-overlay.c     |    42 +-
 external/bsd/openldap/dist/contrib/slapd-modules/adremap/adremap.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/allop/allop.c                       |     9 +-
 external/bsd/openldap/dist/contrib/slapd-modules/allowed/allowed.c                   |    27 +-
 external/bsd/openldap/dist/contrib/slapd-modules/authzid/authzid.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/autogroup/autogroup.c               |   144 +-
 external/bsd/openldap/dist/contrib/slapd-modules/cloak/cloak.c                       |    20 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/asn.h                    |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/asn_to_syn_mr.c          |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/authorityKeyIdentifier.c |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/authorityKeyIdentifier.h |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/certificate.c            |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/certificate.h            |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/componentlib.c           |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/componentlib.h           |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/crl.c                    |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/crl.h                    |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/comp_match/init.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/datamorph/datamorph.c               |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/denyop/denyop.c                     |     9 +-
 external/bsd/openldap/dist/contrib/slapd-modules/dsaschema/dsaschema.c               |   183 +-
 external/bsd/openldap/dist/contrib/slapd-modules/dupent/dupent.c                     |     9 +-
 external/bsd/openldap/dist/contrib/slapd-modules/kinit/kinit.c                       |    36 +-
 external/bsd/openldap/dist/contrib/slapd-modules/lastbind/lastbind.c                 |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/lastmod/lastmod.c                   |    11 +-
 external/bsd/openldap/dist/contrib/slapd-modules/noopsrch/noopsrch.c                 |    11 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nops/nops.c                         |    13 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/alias.c                       |    10 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/ether.c                       |    14 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/group.c                       |    22 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/host.c                        |    16 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/netgroup.c                    |    16 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/network.c                     |    16 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd/attrs.h         |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd-prot.h    |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd/nslcd.h         |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd/tio.c           |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-pam-ldapd/tio.h           |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nssov.c                       |   148 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/nssov.h                       |    15 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/pam.c                         |    52 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/passwd.c                      |    30 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/protocol.c                    |    18 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/rpc.c                         |    18 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/service.c                     |    20 +-
 external/bsd/openldap/dist/contrib/slapd-modules/nssov/shadow.c                      |    22 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/apr1.c                       |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/argon2/Makefile              |    72 -
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/argon2/README                |   109 -
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/argon2/pw-argon2.c           |   225 -
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/argon2/slapd-pw-argon2.5     |   122 -
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/kerberos.c                   |     9 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/netscape.c                   |     9 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/pbkdf2/pw-pbkdf2.c           |     8 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/radius.c                     |     6 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2/sha2.c                  |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2/sha2.h                  |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/sha2/slapd-sha2.c            |     6 +-
 external/bsd/openldap/dist/contrib/slapd-modules/passwd/totp/slapd-totp.c            |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/ppm/ppm.c                           |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/ppm/ppm.h                           |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/ppm/ppm_test.c                      |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/proxyOld/proxyOld.c                 |    12 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/init.c                         |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/jts.c                          |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/ldap_rbac.h                    |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbac.c                         |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbac.h                         |     2 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbacacl.c                      |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbacaudit.c                    |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbacperm.c                     |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbacreq.c                      |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbacsess.c                     |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/rbacuser.c                     |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/rbac/util.c                         |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/samba4/pguid.c                      |    24 +-
 external/bsd/openldap/dist/contrib/slapd-modules/samba4/rdnval.c                     |    39 +-
 external/bsd/openldap/dist/contrib/slapd-modules/samba4/vernum.c                     |    34 +-
 external/bsd/openldap/dist/contrib/slapd-modules/smbk5pwd/smbk5pwd.c                 |   131 +-
 external/bsd/openldap/dist/contrib/slapd-modules/trace/trace.c                       |    29 +-
 external/bsd/openldap/dist/contrib/slapd-modules/usn/usn.c                           |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/variant/variant.c                   |     4 +-
 external/bsd/openldap/dist/contrib/slapd-modules/vc/vc.c                             |     4 +-
 external/bsd/openldap/dist/contrib/slapi-plugins/addrdnvalues/addrdnvalues.c         |     4 +-
 external/bsd/openldap/dist/doc/devel/template.c                                      |     2 +-
 external/bsd/openldap/dist/doc/devel/variadic_debug/macros.h                         |     2 +-
 external/bsd/openldap/dist/doc/drafts/draft-zeilenga-ldap-dontusecopy-xx.txt         |   339 -
 external/bsd/openldap/dist/doc/guide/admin/n-way-multi-master.png                    |   Bin 
 external/bsd/openldap/dist/doc/guide/images/src/n-way-multi-master.dia               |   Bin 
 external/bsd/openldap/dist/doc/guide/images/src/n-way-multi-master.svg               |  5293 ----------
 external/bsd/openldap/dist/doc/man/man5/slapd-bdb.5                                  |   286 -
 external/bsd/openldap/dist/doc/man/man5/slapd-bdb.5.links                            |     1 -
 external/bsd/openldap/dist/doc/man/man5/slapd-shell.5                                |   237 -
 external/bsd/openldap/dist/include/Makefile.in                                       |     2 +-
 external/bsd/openldap/dist/include/ac/alloca.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/assert.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/bytes.h                                        |     4 +-
 external/bsd/openldap/dist/include/ac/crypt.h                                        |     4 +-
 external/bsd/openldap/dist/include/ac/ctype.h                                        |     4 +-
 external/bsd/openldap/dist/include/ac/dirent.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/errno.h                                        |    29 +-
 external/bsd/openldap/dist/include/ac/fdset.h                                        |     4 +-
 external/bsd/openldap/dist/include/ac/localize.h                                     |     4 +-
 external/bsd/openldap/dist/include/ac/param.h                                        |     4 +-
 external/bsd/openldap/dist/include/ac/regex.h                                        |     4 +-
 external/bsd/openldap/dist/include/ac/setproctitle.h                                 |    35 -
 external/bsd/openldap/dist/include/ac/signal.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/socket.h                                       |    22 +-
 external/bsd/openldap/dist/include/ac/stdarg.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/stdlib.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/string.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/sysexits.h                                     |     4 +-
 external/bsd/openldap/dist/include/ac/syslog.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/termios.h                                      |     4 +-
 external/bsd/openldap/dist/include/ac/time.h                                         |    11 +-
 external/bsd/openldap/dist/include/ac/unistd.h                                       |     4 +-
 external/bsd/openldap/dist/include/ac/wait.h                                         |     4 +-
 external/bsd/openldap/dist/include/avl.h                                             |   160 -
 external/bsd/openldap/dist/include/getopt-compat.h                                   |     4 +-
 external/bsd/openldap/dist/include/lber.h                                            |    14 +-
 external/bsd/openldap/dist/include/lber_pvt.h                                        |     9 +-
 external/bsd/openldap/dist/include/ldap.h                                            |   363 +-
 external/bsd/openldap/dist/include/ldap_avl.h                                        |     2 +-
 external/bsd/openldap/dist/include/ldap_cdefs.h                                      |     4 +-
 external/bsd/openldap/dist/include/ldap_defaults.h                                   |     9 +-
 external/bsd/openldap/dist/include/ldap_int_thread.h                                 |    36 +-
 external/bsd/openldap/dist/include/ldap_log.h                                        |   103 +-
 external/bsd/openldap/dist/include/ldap_pvt.h                                        |    58 +-
 external/bsd/openldap/dist/include/ldap_pvt_thread.h                                 |    68 +-
 external/bsd/openldap/dist/include/ldap_pvt_uc.h                                     |     6 +-
 external/bsd/openldap/dist/include/ldap_queue.h                                      |   144 +-
 external/bsd/openldap/dist/include/ldap_rq.h                                         |     5 +-
 external/bsd/openldap/dist/include/ldap_schema.h                                     |     4 +-
 external/bsd/openldap/dist/include/ldap_utf8.h                                       |     4 +-
 external/bsd/openldap/dist/include/ldif.h                                            |    14 +-
 external/bsd/openldap/dist/include/lutil.h                                           |    28 +-
 external/bsd/openldap/dist/include/lutil_hash.h                                      |    46 +-
 external/bsd/openldap/dist/include/lutil_ldap.h                                      |     4 +-
 external/bsd/openldap/dist/include/lutil_lockf.h                                     |     4 +-
 external/bsd/openldap/dist/include/lutil_md5.h                                       |     4 +-
 external/bsd/openldap/dist/include/lutil_meter.h                                     |     4 +-
 external/bsd/openldap/dist/include/lutil_sha1.h                                      |     4 +-
 external/bsd/openldap/dist/include/openldap.h                                        |     4 +-
 external/bsd/openldap/dist/include/portable.hin                                      |   151 +-
 external/bsd/openldap/dist/include/rewrite.h                                         |     4 +-
 external/bsd/openldap/dist/include/slapi-plugin.h                                    |     8 +-
 external/bsd/openldap/dist/include/sysexits-compat.h                                 |     4 +-
 external/bsd/openldap/dist/libraries/liblber/assert.c                                |     6 +-
 external/bsd/openldap/dist/libraries/liblber/bprint.c                                |     6 +-
 external/bsd/openldap/dist/libraries/liblber/debug.c                                 |    42 +-
 external/bsd/openldap/dist/libraries/liblber/decode.c                                |    52 +-
 external/bsd/openldap/dist/libraries/liblber/dtest.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/liblber/encode.c                                |     8 +-
 external/bsd/openldap/dist/libraries/liblber/etest.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/liblber/idtest.c                                |     6 +-
 external/bsd/openldap/dist/libraries/liblber/io.c                                    |     6 +-
 external/bsd/openldap/dist/libraries/liblber/lber-int.h                              |     5 +-
 external/bsd/openldap/dist/libraries/liblber/memory.c                                |     8 +-
 external/bsd/openldap/dist/libraries/liblber/nt_err.c                                |     6 +-
 external/bsd/openldap/dist/libraries/liblber/options.c                               |    14 +-
 external/bsd/openldap/dist/libraries/liblber/sockbuf.c                               |     6 +-
 external/bsd/openldap/dist/libraries/liblber/stdio.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/libldap/abandon.c                               |    78 +-
 external/bsd/openldap/dist/libraries/libldap/account_usability.c                     |     4 +-
 external/bsd/openldap/dist/libraries/libldap/add.c                                   |     8 +-
 external/bsd/openldap/dist/libraries/libldap/addentry.c                              |     6 +-
 external/bsd/openldap/dist/libraries/libldap/apitest.c                               |     8 +-
 external/bsd/openldap/dist/libraries/libldap/assertion.c                             |     6 +-
 external/bsd/openldap/dist/libraries/libldap/avl.c                                   |     4 +-
 external/bsd/openldap/dist/libraries/libldap/bind.c                                  |    10 +-
 external/bsd/openldap/dist/libraries/libldap/cancel.c                                |     6 +-
 external/bsd/openldap/dist/libraries/libldap/charray.c                               |     6 +-
 external/bsd/openldap/dist/libraries/libldap/compare.c                               |     8 +-
 external/bsd/openldap/dist/libraries/libldap/controls.c                              |     6 +-
 external/bsd/openldap/dist/libraries/libldap/cyrus.c                                 |   132 +-
 external/bsd/openldap/dist/libraries/libldap/dds.c                                   |     6 +-
 external/bsd/openldap/dist/libraries/libldap/delete.c                                |    14 +-
 external/bsd/openldap/dist/libraries/libldap/deref.c                                 |    19 +-
 external/bsd/openldap/dist/libraries/libldap/dnssrv.c                                |    53 +-
 external/bsd/openldap/dist/libraries/libldap/dntest.c                                |     6 +-
 external/bsd/openldap/dist/libraries/libldap/error.c                                 |    19 +-
 external/bsd/openldap/dist/libraries/libldap/extended.c                              |    14 +-
 external/bsd/openldap/dist/libraries/libldap/fetch.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/libldap/filter.c                                |    57 +-
 external/bsd/openldap/dist/libraries/libldap/free.c                                  |     6 +-
 external/bsd/openldap/dist/libraries/libldap/ftest.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/libldap/getattr.c                               |    12 +-
 external/bsd/openldap/dist/libraries/libldap/getdn.c                                 |    63 +-
 external/bsd/openldap/dist/libraries/libldap/getentry.c                              |     6 +-
 external/bsd/openldap/dist/libraries/libldap/getvalues.c                             |    10 +-
 external/bsd/openldap/dist/libraries/libldap/gssapi.c                                |  1016 -
 external/bsd/openldap/dist/libraries/libldap/init.c                                  |   308 +-
 external/bsd/openldap/dist/libraries/libldap/lbase64.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/ldap-int.h                              |   123 +-
 external/bsd/openldap/dist/libraries/libldap/ldap-tls.h                              |    17 +-
 external/bsd/openldap/dist/libraries/libldap/ldap_sync.c                             |     6 +-
 external/bsd/openldap/dist/libraries/libldap/ldap_thr_debug.h                        |     2 +-
 external/bsd/openldap/dist/libraries/libldap/ldif.c                                  |   121 +-
 external/bsd/openldap/dist/libraries/libldap/ldifutil.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/messages.c                              |     6 +-
 external/bsd/openldap/dist/libraries/libldap/modify.c                                |    10 +-
 external/bsd/openldap/dist/libraries/libldap/modrdn.c                                |    10 +-
 external/bsd/openldap/dist/libraries/libldap/msctrl.c                                |     4 +-
 external/bsd/openldap/dist/libraries/libldap/open.c                                  |    84 +-
 external/bsd/openldap/dist/libraries/libldap/options.c                               |    98 +-
 external/bsd/openldap/dist/libraries/libldap/os-ip.c                                 |   317 +-
 external/bsd/openldap/dist/libraries/libldap/os-local.c                              |    48 +-
 external/bsd/openldap/dist/libraries/libldap/pagectrl.c                              |     6 +-
 external/bsd/openldap/dist/libraries/libldap/passwd.c                                |     8 +-
 external/bsd/openldap/dist/libraries/libldap/ppolicy.c                               |    51 +-
 external/bsd/openldap/dist/libraries/libldap/print.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/libldap/psearchctrl.c                           |     4 +-
 external/bsd/openldap/dist/libraries/libldap/rdwr.c                                  |     4 +-
 external/bsd/openldap/dist/libraries/libldap/references.c                            |     8 +-
 external/bsd/openldap/dist/libraries/libldap/request.c                               |   305 +-
 external/bsd/openldap/dist/libraries/libldap/result.c                                |   129 +-
 external/bsd/openldap/dist/libraries/libldap/rq.c                                    |     4 +-
 external/bsd/openldap/dist/libraries/libldap/sasl.c                                  |    27 +-
 external/bsd/openldap/dist/libraries/libldap/sbind.c                                 |    10 +-
 external/bsd/openldap/dist/libraries/libldap/schema.c                                |    25 +-
 external/bsd/openldap/dist/libraries/libldap/search.c                                |    12 +-
 external/bsd/openldap/dist/libraries/libldap/sort.c                                  |     6 +-
 external/bsd/openldap/dist/libraries/libldap/sortctrl.c                              |    10 +-
 external/bsd/openldap/dist/libraries/libldap/stctrl.c                                |     6 +-
 external/bsd/openldap/dist/libraries/libldap/string.c                                |     6 +-
 external/bsd/openldap/dist/libraries/libldap/t61.c                                   |     6 +-
 external/bsd/openldap/dist/libraries/libldap/tavl.c                                  |     4 +-
 external/bsd/openldap/dist/libraries/libldap/test.c                                  |    12 +-
 external/bsd/openldap/dist/libraries/libldap/testavl.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/testtavl.c                              |     4 +-
 external/bsd/openldap/dist/libraries/libldap/thr_debug.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/thr_nt.c                                |     4 +-
 external/bsd/openldap/dist/libraries/libldap/thr_posix.c                             |     4 +-
 external/bsd/openldap/dist/libraries/libldap/thr_pth.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/thr_thr.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/threads.c                               |     4 +-
 external/bsd/openldap/dist/libraries/libldap/tls2.c                                  |   365 +-
 external/bsd/openldap/dist/libraries/libldap/tls_g.c                                 |   465 +-
 external/bsd/openldap/dist/libraries/libldap/tls_m.c                                 |  3329 ------
 external/bsd/openldap/dist/libraries/libldap/tls_o.c                                 |   588 +-
 external/bsd/openldap/dist/libraries/libldap/tpool.c                                 |     4 +-
 external/bsd/openldap/dist/libraries/libldap/turn.c                                  |     8 +-
 external/bsd/openldap/dist/libraries/libldap/txn.c                                   |    18 +-
 external/bsd/openldap/dist/libraries/libldap/unbind.c                                |    26 +-
 external/bsd/openldap/dist/libraries/libldap/url.c                                   |    50 +-
 external/bsd/openldap/dist/libraries/libldap/urltest.c                               |     6 +-
 external/bsd/openldap/dist/libraries/libldap/utf-8-conv.c                            |     6 +-
 external/bsd/openldap/dist/libraries/libldap/utf-8.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/libldap/util-int.c                              |   226 +-
 external/bsd/openldap/dist/libraries/libldap/vc.c                                    |     4 +-
 external/bsd/openldap/dist/libraries/libldap/vlvctrl.c                               |    10 +-
 external/bsd/openldap/dist/libraries/libldap/whoami.c                                |     8 +-
 external/bsd/openldap/dist/libraries/libldap_r/Makefile.in                           |    88 -
 external/bsd/openldap/dist/libraries/libldap_r/ldap_thr_debug.h                      |   193 -
 external/bsd/openldap/dist/libraries/libldap_r/rdwr.c                                |   463 -
 external/bsd/openldap/dist/libraries/libldap_r/rmutex.c                              |   224 -
 external/bsd/openldap/dist/libraries/libldap_r/rq.c                                  |   226 -
 external/bsd/openldap/dist/libraries/libldap_r/thr_cthreads.c                        |   185 -
 external/bsd/openldap/dist/libraries/libldap_r/thr_debug.c                           |  1297 --
 external/bsd/openldap/dist/libraries/libldap_r/thr_nt.c                              |   250 -
 external/bsd/openldap/dist/libraries/libldap_r/thr_posix.c                           |   393 -
 external/bsd/openldap/dist/libraries/libldap_r/thr_pth.c                             |   236 -
 external/bsd/openldap/dist/libraries/libldap_r/thr_stub.c                            |   310 -
 external/bsd/openldap/dist/libraries/libldap_r/thr_thr.c                             |   191 -
 external/bsd/openldap/dist/libraries/libldap_r/threads.c                             |   118 -
 external/bsd/openldap/dist/libraries/libldap_r/tpool.c                               |  1037 -
 external/bsd/openldap/dist/libraries/liblmdb/lmdb.h                                  |    12 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb.c                                   |   252 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_copy.c                              |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_dump.c                              |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_load.c                              |    57 +-
 external/bsd/openldap/dist/libraries/liblmdb/mdb_stat.c                              |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/midl.c                                  |     6 +-
 external/bsd/openldap/dist/libraries/liblmdb/midl.h                                  |     6 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest.c                                 |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest2.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest3.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest4.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest5.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblmdb/mtest6.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucdata.c                     |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucdata.h                     |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucgendat.c                   |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucpgba.c                     |    10 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/ucpgba.h                     |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucdata/uctable.h                    |     2 +-
 external/bsd/openldap/dist/libraries/liblunicode/ucstr.c                             |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/ure/ure.c                           |    12 +-
 external/bsd/openldap/dist/libraries/liblunicode/ure/ure.h                           |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/ure/urestubs.c                      |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/utbm/utbm.c                         |     4 +-
 external/bsd/openldap/dist/libraries/liblunicode/utbm/utbm.h                         |     6 +-
 external/bsd/openldap/dist/libraries/liblunicode/utbm/utbmstub.c                     |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/avl.c                                  |   674 -
 external/bsd/openldap/dist/libraries/liblutil/base64.c                               |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/detach.c                               |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/entropy.c                              |    10 +-
 external/bsd/openldap/dist/libraries/liblutil/getopt.c                               |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/getpass.c                              |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/getpeereid.c                           |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/hash.c                                 |    76 +-
 external/bsd/openldap/dist/libraries/liblutil/lockf.c                                |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/md5.c                                  |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/memcmp.c                               |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/meter.c                                |     4 +-
 external/bsd/openldap/dist/libraries/liblutil/ntservice.c                            |    20 +-
 external/bsd/openldap/dist/libraries/liblutil/passfile.c                             |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/passwd.c                               |   340 +-
 external/bsd/openldap/dist/libraries/liblutil/ptest.c                                |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/sasl.c                                 |     8 +-
 external/bsd/openldap/dist/libraries/liblutil/setproctitle.c                         |    83 -
 external/bsd/openldap/dist/libraries/liblutil/sha1.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/signal.c                               |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/slapdmsg.h                             |     2 +-
 external/bsd/openldap/dist/libraries/liblutil/sockpair.c                             |     6 +-
 external/bsd/openldap/dist/libraries/liblutil/tavl.c                                 |   528 -
 external/bsd/openldap/dist/libraries/liblutil/testavl.c                              |   155 -
 external/bsd/openldap/dist/libraries/liblutil/testtavl.c                             |   163 -
 external/bsd/openldap/dist/libraries/liblutil/utils.c                                |   150 +-
 external/bsd/openldap/dist/libraries/liblutil/uuid.c                                 |     6 +-
 external/bsd/openldap/dist/libraries/librewrite/config.c                             |    70 +-
 external/bsd/openldap/dist/libraries/librewrite/context.c                            |    16 +-
 external/bsd/openldap/dist/libraries/librewrite/info.c                               |    12 +-
 external/bsd/openldap/dist/libraries/librewrite/ldapmap.c                            |    10 +-
 external/bsd/openldap/dist/libraries/librewrite/map.c                                |     5 +-
 external/bsd/openldap/dist/libraries/librewrite/params.c                             |    10 +-
 external/bsd/openldap/dist/libraries/librewrite/parse.c                              |     4 +-
 external/bsd/openldap/dist/libraries/librewrite/rewrite-int.h                        |     9 +-
 external/bsd/openldap/dist/libraries/librewrite/rewrite-map.h                        |     4 +-
 external/bsd/openldap/dist/libraries/librewrite/rewrite.c                            |     4 +-
 external/bsd/openldap/dist/libraries/librewrite/rule.c                               |     4 +-
 external/bsd/openldap/dist/libraries/librewrite/session.c                            |    18 +-
 external/bsd/openldap/dist/libraries/librewrite/subst.c                              |    34 +-
 external/bsd/openldap/dist/libraries/librewrite/var.c                                |    12 +-
 external/bsd/openldap/dist/libraries/librewrite/xmap.c                               |    10 +-
 external/bsd/openldap/dist/servers/lloadd/backend.c                                  |     4 +-
 external/bsd/openldap/dist/servers/lloadd/bind.c                                     |     4 +-
 external/bsd/openldap/dist/servers/lloadd/client.c                                   |     4 +-
 external/bsd/openldap/dist/servers/lloadd/config.c                                   |     4 +-
 external/bsd/openldap/dist/servers/lloadd/connection.c                               |     4 +-
 external/bsd/openldap/dist/servers/lloadd/daemon.c                                   |     4 +-
 external/bsd/openldap/dist/servers/lloadd/epoch.c                                    |     4 +-
 external/bsd/openldap/dist/servers/lloadd/epoch.h                                    |     2 +-
 external/bsd/openldap/dist/servers/lloadd/extended.c                                 |     4 +-
 external/bsd/openldap/dist/servers/lloadd/init.c                                     |     4 +-
 external/bsd/openldap/dist/servers/lloadd/libevent_support.c                         |     4 +-
 external/bsd/openldap/dist/servers/lloadd/lload-config.h                             |     2 +-
 external/bsd/openldap/dist/servers/lloadd/lload.h                                    |     2 +-
 external/bsd/openldap/dist/servers/lloadd/main.c                                     |     4 +-
 external/bsd/openldap/dist/servers/lloadd/module_init.c                              |     4 +-
 external/bsd/openldap/dist/servers/lloadd/monitor.c                                  |     4 +-
 external/bsd/openldap/dist/servers/lloadd/operation.c                                |     4 +-
 external/bsd/openldap/dist/servers/lloadd/proto-lload.h                              |     2 +-
 external/bsd/openldap/dist/servers/lloadd/upstream.c                                 |     4 +-
 external/bsd/openldap/dist/servers/lloadd/value.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/DB_CONFIG                                   |    28 -
 external/bsd/openldap/dist/servers/slapd/abandon.c                                   |    20 +-
 external/bsd/openldap/dist/servers/slapd/aci.c                                       |   119 +-
 external/bsd/openldap/dist/servers/slapd/acl.c                                       |   108 +-
 external/bsd/openldap/dist/servers/slapd/aclparse.c                                  |   280 +-
 external/bsd/openldap/dist/servers/slapd/ad.c                                        |    25 +-
 external/bsd/openldap/dist/servers/slapd/add.c                                       |    67 +-
 external/bsd/openldap/dist/servers/slapd/alock.c                                     |   723 -
 external/bsd/openldap/dist/servers/slapd/alock.h                                     |    79 -
 external/bsd/openldap/dist/servers/slapd/at.c                                        |    38 +-
 external/bsd/openldap/dist/servers/slapd/attr.c                                      |    38 +-
 external/bsd/openldap/dist/servers/slapd/ava.c                                       |    14 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/add.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/back-asyncmeta.h             |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/bind.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/candidates.c                 |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/compare.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/config.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/conn.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/delete.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/dncache.c                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/init.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/map.c                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/message_queue.c              |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/meta_result.c                |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/modify.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/modrdn.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/proto-asyncmeta.h            |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-asyncmeta/search.c                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-bdb/Makefile.in                        |    53 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/add.c                              |   552 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/attr.c                             |   446 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/back-bdb.h                         |   379 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/bind.c                             |   171 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/cache.c                            |  1697 ---
 external/bsd/openldap/dist/servers/slapd/back-bdb/compare.c                          |   148 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/config.c                           |   956 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/dbcache.c                          |   215 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/delete.c                           |   610 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/dn2entry.c                         |    89 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/dn2id.c                            |  1220 --
 external/bsd/openldap/dist/servers/slapd/back-bdb/error.c                            |    67 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/extended.c                         |    59 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/filterindex.c                      |  1188 --
 external/bsd/openldap/dist/servers/slapd/back-bdb/id2entry.c                         |   451 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/idl.c                              |  1575 --
 external/bsd/openldap/dist/servers/slapd/back-bdb/idl.h                              |    77 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/index.c                            |   579 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/init.c                             |   879 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/key.c                              |   109 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/modify.c                           |   840 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/modrdn.c                           |   847 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/monitor.c                          |   729 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/nextid.c                           |    85 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/operational.c                      |   156 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/proto-bdb.h                        |   680 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/referral.c                         |   157 -
 external/bsd/openldap/dist/servers/slapd/back-bdb/search.c                           |  1393 --
 external/bsd/openldap/dist/servers/slapd/back-bdb/tools.c                            |  1332 --
 external/bsd/openldap/dist/servers/slapd/back-bdb/trans.c                            |    61 -
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/bind.c                          |    14 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/compare.c                       |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/config.c                        |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/init.c                          |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/proto-dnssrv.h                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/referral.c                      |    18 +-
 external/bsd/openldap/dist/servers/slapd/back-dnssrv/search.c                        |    19 +-
 external/bsd/openldap/dist/servers/slapd/back-hdb/Makefile.in                        |    70 -
 external/bsd/openldap/dist/servers/slapd/back-hdb/back-bdb.h                         |    33 -
 external/bsd/openldap/dist/servers/slapd/back-ldap/add.c                             |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/back-ldap.h                       |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/bind.c                            |   298 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/chain.c                           |   263 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/compare.c                         |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/config.c                          |   589 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/delete.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/distproc.c                        |   151 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/extended.c                        |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/init.c                            |    26 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/modify.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/modrdn.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/monitor.c                         |    56 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/pbind.c                           |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/proto-ldap.h                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/search.c                          |    16 +-
 external/bsd/openldap/dist/servers/slapd/back-ldap/unbind.c                          |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-ldif/ldif.c                            |   189 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/add.c                              |   100 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/attr.c                             |   239 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/back-mdb.h                         |    56 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/bind.c                             |    16 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/compare.c                          |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/config.c                           |   180 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/delete.c                           |   163 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/dn2entry.c                         |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/dn2id.c                            |    28 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/extended.c                         |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/filterindex.c                      |   116 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/id2entry.c                         |   560 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/idl.c                              |    92 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/idl.h                              |    20 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/index.c                            |    14 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/init.c                             |    52 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/key.c                              |    12 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/modify.c                           |   346 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/modrdn.c                           |   138 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/monitor.c                          |    33 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/nextid.c                           |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/operational.c                      |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/proto-mdb.h                        |    23 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/referral.c                         |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/search.c                           |   122 +-
 external/bsd/openldap/dist/servers/slapd/back-mdb/tools.c                            |   408 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/add.c                             |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/back-meta.h                       |    19 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/bind.c                            |    95 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/candidates.c                      |    16 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/compare.c                         |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/config.c                          |   351 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/conn.c                            |    99 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/delete.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/dncache.c                         |    14 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/init.c                            |    24 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/map.c                             |    73 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/modify.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/modrdn.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/proto-meta.h                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/search.c                          |   134 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/suffixmassage.c                   |    89 +-
 external/bsd/openldap/dist/servers/slapd/back-meta/unbind.c                          |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/back-monitor.h                 |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/backend.c                      |    15 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/bind.c                         |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/cache.c                        |    25 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/compare.c                      |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/conn.c                         |    32 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/database.c                     |    85 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/entry.c                        |    19 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/init.c                         |   188 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/listener.c                     |    14 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/log.c                          |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/modify.c                       |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/operation.c                    |    13 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/operational.c                  |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/overlay.c                      |    15 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/proto-back-monitor.h           |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/rww.c                          |    12 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/search.c                       |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/sent.c                         |    12 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/thread.c                       |    19 +-
 external/bsd/openldap/dist/servers/slapd/back-monitor/time.c                         |    20 +-
 external/bsd/openldap/dist/servers/slapd/back-ndb/back-ndb.h                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-ndb/proto-ndb.h                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-null/null.c                            |    18 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/back-passwd.h                   |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/config.c                        |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/init.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/proto-passwd.h                  |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-passwd/search.c                        |    56 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/add.c                             |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/asperl_undefs.h                   |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/bind.c                            |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/close.c                           |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/compare.c                         |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/config.c                          |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/delete.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/init.c                            |    15 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/modify.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/modrdn.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/perl_back.h                       |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/proto-perl.h                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-perl/search.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/back-relay.h                     |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/init.c                           |    19 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/op.c                             |    16 +-
 external/bsd/openldap/dist/servers/slapd/back-relay/proto-back-relay.h               |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-shell/Makefile.in                      |    43 -
 external/bsd/openldap/dist/servers/slapd/back-shell/add.c                            |    89 -
 external/bsd/openldap/dist/servers/slapd/back-shell/bind.c                           |   110 -
 external/bsd/openldap/dist/servers/slapd/back-shell/compare.c                        |   104 -
 external/bsd/openldap/dist/servers/slapd/back-shell/config.c                         |   142 -
 external/bsd/openldap/dist/servers/slapd/back-shell/delete.c                         |    95 -
 external/bsd/openldap/dist/servers/slapd/back-shell/fork.c                           |   123 -
 external/bsd/openldap/dist/servers/slapd/back-shell/init.c                           |   116 -
 external/bsd/openldap/dist/servers/slapd/back-shell/modify.c                         |   131 -
 external/bsd/openldap/dist/servers/slapd/back-shell/modrdn.c                         |   101 -
 external/bsd/openldap/dist/servers/slapd/back-shell/proto-shell.h                    |    58 -
 external/bsd/openldap/dist/servers/slapd/back-shell/result.c                         |   140 -
 external/bsd/openldap/dist/servers/slapd/back-shell/search.c                         |    91 -
 external/bsd/openldap/dist/servers/slapd/back-shell/searchexample.conf               |    29 -
 external/bsd/openldap/dist/servers/slapd/back-shell/searchexample.sh                 |    65 -
 external/bsd/openldap/dist/servers/slapd/back-shell/shell.h                          |    67 -
 external/bsd/openldap/dist/servers/slapd/back-shell/unbind.c                         |    74 -
 external/bsd/openldap/dist/servers/slapd/back-sock/add.c                             |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/back-sock.h                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/bind.c                            |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/compare.c                         |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/config.c                          |     8 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/delete.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/extended.c                        |    10 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/init.c                            |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/modify.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/modrdn.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/opensock.c                        |    12 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/proto-sock.h                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/result.c                          |    13 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/search.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sock/unbind.c                          |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/add.c                              |   167 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/api.c                              |     6 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/back-sql.h                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/bind.c                             |    18 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/compare.c                          |    16 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/config.c                           |    97 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/delete.c                           |    58 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/entry-id.c                         |   121 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/init.c                             |    99 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/modify.c                           |    20 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/modrdn.c                           |    81 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/operational.c                      |    24 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/proto-sql.h                        |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/schema-map.c                       |   181 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/search.c                           |    98 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/sql-wrap.c                         |    73 +-
 external/bsd/openldap/dist/servers/slapd/back-sql/util.c                             |    32 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/add.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/attr.c                              |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/back-wt.h                           |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/bind.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/compare.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/config.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/ctx.c                               |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/delete.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/dn2entry.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/dn2id.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/filterindex.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/id2entry.c                          |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/idl.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/idl.h                               |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/index.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/init.c                              |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/key.c                               |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/modify.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/nextid.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/operational.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/proto-wt.h                          |     2 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/search.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/back-wt/tools.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/backend.c                                   |   125 +-
 external/bsd/openldap/dist/servers/slapd/backglue.c                                  |    37 +-
 external/bsd/openldap/dist/servers/slapd/backover.c                                  |   166 +-
 external/bsd/openldap/dist/servers/slapd/bconfig.c                                   |  1019 +-
 external/bsd/openldap/dist/servers/slapd/bind.c                                      |   159 +-
 external/bsd/openldap/dist/servers/slapd/cancel.c                                    |    15 +-
 external/bsd/openldap/dist/servers/slapd/ch_malloc.c                                 |    14 +-
 external/bsd/openldap/dist/servers/slapd/compare.c                                   |    26 +-
 external/bsd/openldap/dist/servers/slapd/component.c                                 |   116 +-
 external/bsd/openldap/dist/servers/slapd/component.h                                 |     6 +-
 external/bsd/openldap/dist/servers/slapd/config.c                                    |   359 +-
 external/bsd/openldap/dist/servers/slapd/config.h                                    |   229 -
 external/bsd/openldap/dist/servers/slapd/connection.c                                |   435 +-
 external/bsd/openldap/dist/servers/slapd/controls.c                                  |   163 +-
 external/bsd/openldap/dist/servers/slapd/cr.c                                        |    20 +-
 external/bsd/openldap/dist/servers/slapd/ctxcsn.c                                    |    20 +-
 external/bsd/openldap/dist/servers/slapd/daemon.c                                    |   988 +-
 external/bsd/openldap/dist/servers/slapd/delete.c                                    |    39 +-
 external/bsd/openldap/dist/servers/slapd/dn.c                                        |    49 +-
 external/bsd/openldap/dist/servers/slapd/entry.c                                     |    51 +-
 external/bsd/openldap/dist/servers/slapd/extended.c                                  |    88 +-
 external/bsd/openldap/dist/servers/slapd/filter.c                                    |    86 +-
 external/bsd/openldap/dist/servers/slapd/filterentry.c                               |    48 +-
 external/bsd/openldap/dist/servers/slapd/frontend.c                                  |     6 +-
 external/bsd/openldap/dist/servers/slapd/globals.c                                   |     6 +-
 external/bsd/openldap/dist/servers/slapd/index.c                                     |     6 +-
 external/bsd/openldap/dist/servers/slapd/init.c                                      |    59 +-
 external/bsd/openldap/dist/servers/slapd/ldapsync.c                                  |    69 +-
 external/bsd/openldap/dist/servers/slapd/limits.c                                    |    20 +-
 external/bsd/openldap/dist/servers/slapd/lock.c                                      |    10 +-
 external/bsd/openldap/dist/servers/slapd/main.c                                      |   141 +-
 external/bsd/openldap/dist/servers/slapd/matchedValues.c                             |    22 +-
 external/bsd/openldap/dist/servers/slapd/modify.c                                    |    78 +-
 external/bsd/openldap/dist/servers/slapd/modrdn.c                                    |   165 +-
 external/bsd/openldap/dist/servers/slapd/mods.c                                      |     6 +-
 external/bsd/openldap/dist/servers/slapd/module.c                                    |    33 +-
 external/bsd/openldap/dist/servers/slapd/mr.c                                        |    42 +-
 external/bsd/openldap/dist/servers/slapd/mra.c                                       |    22 +-
 external/bsd/openldap/dist/servers/slapd/nt_svc.c                                    |     6 +-
 external/bsd/openldap/dist/servers/slapd/oc.c                                        |    30 +-
 external/bsd/openldap/dist/servers/slapd/oidm.c                                      |    16 +-
 external/bsd/openldap/dist/servers/slapd/operation.c                                 |    15 +-
 external/bsd/openldap/dist/servers/slapd/operational.c                               |     6 +-
 external/bsd/openldap/dist/servers/slapd/overlays/accesslog.c                        |   508 +-
 external/bsd/openldap/dist/servers/slapd/overlays/auditlog.c                         |    10 +-
 external/bsd/openldap/dist/servers/slapd/overlays/autoca.c                           |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/collect.c                          |    15 +-
 external/bsd/openldap/dist/servers/slapd/overlays/constraint.c                       |    47 +-
 external/bsd/openldap/dist/servers/slapd/overlays/dds.c                              |    88 +-
 external/bsd/openldap/dist/servers/slapd/overlays/deref.c                            |    11 +-
 external/bsd/openldap/dist/servers/slapd/overlays/dyngroup.c                         |    20 +-
 external/bsd/openldap/dist/servers/slapd/overlays/dynlist.c                          |  1431 ++-
 external/bsd/openldap/dist/servers/slapd/overlays/homedir.c                          |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/memberof.c                         |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/otp.c                              |     2 +-
 external/bsd/openldap/dist/servers/slapd/overlays/overlays.c                         |     8 +-
 external/bsd/openldap/dist/servers/slapd/overlays/pcache.c                           |   384 +-
 external/bsd/openldap/dist/servers/slapd/overlays/ppolicy.c                          |  1266 ++-
 external/bsd/openldap/dist/servers/slapd/overlays/refint.c                           |    37 +-
 external/bsd/openldap/dist/servers/slapd/overlays/remoteauth.c                       |     4 +-
 external/bsd/openldap/dist/servers/slapd/overlays/retcode.c                          |    51 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwm.c                              |   114 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwm.h                              |     8 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwmconf.c                          |    44 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwmdn.c                            |     8 +-
 external/bsd/openldap/dist/servers/slapd/overlays/rwmmap.c                           |    16 +-
 external/bsd/openldap/dist/servers/slapd/overlays/seqmod.c                           |    17 +-
 external/bsd/openldap/dist/servers/slapd/overlays/sssvlv.c                           |    83 +-
 external/bsd/openldap/dist/servers/slapd/overlays/syncprov.c                         |  1245 +-
 external/bsd/openldap/dist/servers/slapd/overlays/translucent.c                      |   136 +-
 external/bsd/openldap/dist/servers/slapd/overlays/unique.c                           |   225 +-
 external/bsd/openldap/dist/servers/slapd/overlays/valsort.c                          |    23 +-
 external/bsd/openldap/dist/servers/slapd/passwd.c                                    |    97 +-
 external/bsd/openldap/dist/servers/slapd/phonetic.c                                  |     6 +-
 external/bsd/openldap/dist/servers/slapd/proto-slap.h                                |    93 +-
 external/bsd/openldap/dist/servers/slapd/proxyp.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/pwmods/argon2.c                             |     4 +-
 external/bsd/openldap/dist/servers/slapd/referral.c                                  |    16 +-
 external/bsd/openldap/dist/servers/slapd/result.c                                    |   217 +-
 external/bsd/openldap/dist/servers/slapd/root_dse.c                                  |    16 +-
 external/bsd/openldap/dist/servers/slapd/sasl.c                                      |   216 +-
 external/bsd/openldap/dist/servers/slapd/saslauthz.c                                 |   543 +-
 external/bsd/openldap/dist/servers/slapd/schema.c                                    |     8 +-
 external/bsd/openldap/dist/servers/slapd/schema/ppolicy.ldif                         |    87 -
 external/bsd/openldap/dist/servers/slapd/schema/ppolicy.schema                       |   556 -
 external/bsd/openldap/dist/servers/slapd/schema_check.c                              |    38 +-
 external/bsd/openldap/dist/servers/slapd/schema_init.c                               |   240 +-
 external/bsd/openldap/dist/servers/slapd/schema_prep.c                               |    34 +-
 external/bsd/openldap/dist/servers/slapd/schemaparse.c                               |    34 +-
 external/bsd/openldap/dist/servers/slapd/search.c                                    |    86 +-
 external/bsd/openldap/dist/servers/slapd/sets.c                                      |    10 +-
 external/bsd/openldap/dist/servers/slapd/sets.h                                      |     4 +-
 external/bsd/openldap/dist/servers/slapd/shell-backends/Makefile.in                  |    40 -
 external/bsd/openldap/dist/servers/slapd/shell-backends/passwd-shell.c               |   212 -
 external/bsd/openldap/dist/servers/slapd/shell-backends/shellutil.c                  |   401 -
 external/bsd/openldap/dist/servers/slapd/shell-backends/shellutil.h                  |   125 -
 external/bsd/openldap/dist/servers/slapd/sl_malloc.c                                 |    63 +-
 external/bsd/openldap/dist/servers/slapd/slap-config.h                               |     2 +-
 external/bsd/openldap/dist/servers/slapd/slap.h                                      |   163 +-
 external/bsd/openldap/dist/servers/slapd/slapacl.c                                   |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapadd.c                                   |    25 +-
 external/bsd/openldap/dist/servers/slapd/slapauth.c                                  |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapcat.c                                   |     8 +-
 external/bsd/openldap/dist/servers/slapd/slapcommon.c                                |    80 +-
 external/bsd/openldap/dist/servers/slapd/slapcommon.h                                |    19 +-
 external/bsd/openldap/dist/servers/slapd/slapdn.c                                    |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapi/plugin.c                              |   130 +-
 external/bsd/openldap/dist/servers/slapd/slapi/printmsg.c                            |     4 +-
 external/bsd/openldap/dist/servers/slapd/slapi/proto-slapi.h                         |     8 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi.h                               |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_dn.c                            |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_ext.c                           |     8 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_ops.c                           |    17 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_overlay.c                       |    14 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_pblock.c                        |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapi/slapi_utils.c                         |     8 +-
 external/bsd/openldap/dist/servers/slapd/slapindex.c                                 |     6 +-
 external/bsd/openldap/dist/servers/slapd/slapmodify.c                                |     4 +-
 external/bsd/openldap/dist/servers/slapd/slappasswd.c                                |    47 +-
 external/bsd/openldap/dist/servers/slapd/slapschema.c                                |     8 +-
 external/bsd/openldap/dist/servers/slapd/slaptest.c                                  |    13 +-
 external/bsd/openldap/dist/servers/slapd/starttls.c                                  |    14 +-
 external/bsd/openldap/dist/servers/slapd/str2filter.c                                |     8 +-
 external/bsd/openldap/dist/servers/slapd/syncrepl.c                                  |  2642 ++++-
 external/bsd/openldap/dist/servers/slapd/syntax.c                                    |    26 +-
 external/bsd/openldap/dist/servers/slapd/syslog.c                                    |     4 +-
 external/bsd/openldap/dist/servers/slapd/txn.c                                       |   200 +-
 external/bsd/openldap/dist/servers/slapd/unbind.c                                    |    11 +-
 external/bsd/openldap/dist/servers/slapd/user.c                                      |    31 +-
 external/bsd/openldap/dist/servers/slapd/value.c                                     |    18 +-
 external/bsd/openldap/dist/servers/slapd/zn_malloc.c                                 |    72 +-
 external/bsd/openldap/dist/tests/data/acl.out.master                                 |   367 -
 external/bsd/openldap/dist/tests/data/modify.out.master                              |   396 -
 external/bsd/openldap/dist/tests/data/modrdn.out.master.0                            |   411 -
 external/bsd/openldap/dist/tests/data/modrdn.out.master.1                            |    20 -
 external/bsd/openldap/dist/tests/data/modrdn.out.master.2                            |    19 -
 external/bsd/openldap/dist/tests/data/modrdn.out.master.3                            |    19 -
 external/bsd/openldap/dist/tests/data/regressions/its4337/config.out                 |   129 -
 external/bsd/openldap/dist/tests/data/regressions/its4337/its4337                    |   157 -
 external/bsd/openldap/dist/tests/data/regressions/its4337/slapd.conf                 |    36 -
 external/bsd/openldap/dist/tests/data/regressions/its8752/slapd.conf.mmr             |   144 -
 external/bsd/openldap/dist/tests/data/search.out.master                              |   389 -
 external/bsd/openldap/dist/tests/data/slapd-cache-master-proxyauthz.conf             |    47 -
 external/bsd/openldap/dist/tests/data/slapd-cache-master.conf                        |    44 -
 external/bsd/openldap/dist/tests/data/slapd-deltasync-master.conf                    |    75 -
 external/bsd/openldap/dist/tests/data/slapd-deltasync-slave.conf                     |    76 -
 external/bsd/openldap/dist/tests/data/slapd-master.conf                              |    45 -
 external/bsd/openldap/dist/tests/data/slapd-nis-master.conf                          |    55 -
 external/bsd/openldap/dist/tests/data/slapd-ref-slave.conf                           |    49 -
 external/bsd/openldap/dist/tests/data/slapd-repl-slave-remote.conf                   |    80 -
 external/bsd/openldap/dist/tests/data/slapd-sql-syncrepl-master.conf                 |    80 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-master.conf                     |    50 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-slave-persist-ldap.conf         |    76 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-slave-persist1.conf             |    74 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-slave-persist2.conf             |    46 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-slave-persist3.conf             |    58 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-slave-refresh1.conf             |    65 -
 external/bsd/openldap/dist/tests/data/slapd-syncrepl-slave-refresh2.conf             |    59 -
 external/bsd/openldap/dist/tests/progs/ldif-filter.c                                 |     6 +-
 external/bsd/openldap/dist/tests/progs/slapd-addel.c                                 |   267 +-
 external/bsd/openldap/dist/tests/progs/slapd-auth.c                                  |     4 +-
 external/bsd/openldap/dist/tests/progs/slapd-bind.c                                  |   220 +-
 external/bsd/openldap/dist/tests/progs/slapd-common.c                                |   284 +-
 external/bsd/openldap/dist/tests/progs/slapd-common.h                                |    56 +-
 external/bsd/openldap/dist/tests/progs/slapd-modify.c                                |   167 +-
 external/bsd/openldap/dist/tests/progs/slapd-modrdn.c                                |   175 +-
 external/bsd/openldap/dist/tests/progs/slapd-mtread.c                                |   269 +-
 external/bsd/openldap/dist/tests/progs/slapd-read.c                                  |   243 +-
 external/bsd/openldap/dist/tests/progs/slapd-search.c                                |   263 +-
 external/bsd/openldap/dist/tests/progs/slapd-tester.c                                |   100 +-
 external/bsd/openldap/dist/tests/progs/slapd-watcher.c                               |     4 +-
 external/bsd/openldap/dist/tests/scripts/test050-syncrepl-multimaster                |   789 -
 external/bsd/openldap/dist/tests/scripts/test059-slave-config                        |   444 -
 external/bsd/openldap/dist/tests/scripts/test063-delta-multimaster                   |   563 -
 external/bsd/openldap/lib/liblber/shlib_version                                      |     6 +-
 external/bsd/openldap/lib/libldap/Makefile                                           |     3 +-
 external/bsd/openldap/lib/libldap/Makefile.libldap                                   |    14 +-
 external/bsd/openldap/lib/libldap/shlib_version                                      |     6 +-
 external/bsd/openldap/lib/libldap_r/Makefile                                         |    10 +-
 external/bsd/openldap/lib/libldap_r/shlib_version                                    |     6 +-
 external/bsd/openldap/lib/liblutil/Makefile                                          |     4 +-
 external/bsd/openldap/openldap.mk                                                    |     4 +-
 853 files changed, 23475 insertions(+), 62360 deletions(-)

diffs (truncated from 135381 to 300 lines):

diff -r 87d4f850b75d -r 4291e061e8c5 external/bsd/openldap/bin/Makefile.inc
--- a/external/bsd/openldap/bin/Makefile.inc    Sat Aug 14 16:05:09 2021 +0000
+++ b/external/bsd/openldap/bin/Makefile.inc    Sat Aug 14 16:14:49 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2017/05/21 15:28:39 riastradh Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2021/08/14 16:14:49 christos Exp $
 
 .include "../openldap.mk"
 
@@ -24,12 +24,5 @@
 LDADD+=        -L${LDAPOBJDIR.lutil} -llutil
 DPADD+=        ${LDAPLIB.lutil}
 
-LDADD+= -L${LDAPOBJDIR.ldap} -lldap
-DPADD+= ${LIBLDAP}
-LDADD+=        -llber
-DPADD+=        ${LIBLBER}
-
-.if (${MKPIC} == "no" || (defined(LDSTATIC) && ${LDSTATIC} != ""))
-DPADD+=        ${LIBSSL} ${LIBCRYPTO}
-LDADD+=        -lssl -lcrypto
-.endif
+LDADD+= ${LIBLDAP_LDADD}
+DPADD+= ${LIBLDAP_DPADD}
diff -r 87d4f850b75d -r 4291e061e8c5 external/bsd/openldap/dist/build/mkversion
--- a/external/bsd/openldap/dist/build/mkversion        Sat Aug 14 16:05:09 2021 +0000
+++ b/external/bsd/openldap/dist/build/mkversion        Sat Aug 14 16:14:49 2021 +0000
@@ -3,7 +3,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2020 The OpenLDAP Foundation.
+## Copyright 1998-2021 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,7 @@
 cat << __EOF__
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2020 The OpenLDAP Foundation.
+ * Copyright 1998-2021 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -72,7 +72,7 @@
  */
 
 static const char copyright[] =
-"Copyright 1998-2020 The OpenLDAP Foundation.  All rights reserved.\n"
+"Copyright 1998-2021 The OpenLDAP Foundation.  All rights reserved.\n"
 "COPYING RESTRICTIONS APPLY\n";
 
 $static $const char $SYMBOL[] =
diff -r 87d4f850b75d -r 4291e061e8c5 external/bsd/openldap/dist/build/version.h
--- a/external/bsd/openldap/dist/build/version.h        Sat Aug 14 16:05:09 2021 +0000
+++ b/external/bsd/openldap/dist/build/version.h        Sat Aug 14 16:14:49 2021 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: version.h,v 1.2 2020/08/11 13:15:33 christos Exp $     */
+/*     $NetBSD: version.h,v 1.3 2021/08/14 16:14:49 christos Exp $     */
 
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2020 The OpenLDAP Foundation.
+ * Copyright 1998-2021 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -15,6 +15,6 @@
  */
 
 static const char copyright[] =
-"Copyright 1998-2020 The OpenLDAP Foundation.  All rights reserved.\n"
+"Copyright 1998-2021 The OpenLDAP Foundation.  All rights reserved.\n"
 "COPYING RESTRICTIONS APPLY.\n";
 
diff -r 87d4f850b75d -r 4291e061e8c5 external/bsd/openldap/dist/clients/tools/common.c
--- a/external/bsd/openldap/dist/clients/tools/common.c Sat Aug 14 16:05:09 2021 +0000
+++ b/external/bsd/openldap/dist/clients/tools/common.c Sat Aug 14 16:14:49 2021 +0000
@@ -1,10 +1,10 @@
-/*     $NetBSD: common.c,v 1.9 2020/08/11 13:15:34 christos Exp $      */
+/*     $NetBSD: common.c,v 1.10 2021/08/14 16:14:49 christos Exp $     */
 
 /* common.c - common routines for the ldap client tools */
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2020 The OpenLDAP Foundation.
+ * Copyright 1998-2021 The OpenLDAP Foundation.
  * Portions Copyright 2003 Kurt D. Zeilenga.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: common.c,v 1.9 2020/08/11 13:15:34 christos Exp $");
+__RCSID("$NetBSD: common.c,v 1.10 2021/08/14 16:14:49 christos Exp $");
 
 #include "portable.h"
 
@@ -76,8 +76,6 @@
 
 /* connection */
 char           *ldapuri = NULL;
-char           *ldaphost = NULL;
-int            ldapport = 0;
 int            use_tls = 0;
 int            protocol = -1;
 int            version = 0;
@@ -102,6 +100,7 @@
 char           *assertion = NULL;
 struct berval  assertionvalue = BER_BVNULL;
 char           *authzid = NULL;
+int            authzcrit = 1;
 /* support deprecated early version of proxyAuthz */
 #define LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ      "2.16.840.1.113730.3.4.12"
 #ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
@@ -124,11 +123,13 @@
 #endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
 #ifdef LDAP_CONTROL_X_SESSION_TRACKING
 static int     sessionTracking = 0;
+static char    *sessionTrackingName;
 struct berval  stValue;
 #endif /* LDAP_CONTROL_X_SESSION_TRACKING */
 ber_int_t vlvPos;
 ber_int_t vlvCount;
 struct berval *vlvContext;
+static int     bauthzid;
 
 LDAPControl    *unknown_ctrls = NULL;
 int            unknown_ctrls_num = 0;
@@ -141,6 +142,10 @@
 static int print_preread( LDAP *ld, LDAPControl *ctrl );
 static int print_postread( LDAP *ld, LDAPControl *ctrl );
 static int print_paged_results( LDAP *ld, LDAPControl *ctrl );
+static int print_psearch( LDAP *ld, LDAPControl *ctrl );
+#ifdef LDAP_CONTROL_AUTHZID_RESPONSE
+static int print_authzid( LDAP *ld, LDAPControl *ctrl );
+#endif
 #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
 static int print_ppolicy( LDAP *ld, LDAPControl *ctrl );
 #endif
@@ -152,6 +157,18 @@
 #ifdef LDAP_CONTROL_X_WHATFAILED
 static int print_whatfailed( LDAP *ld, LDAPControl *ctrl );
 #endif
+static int print_syncstate( LDAP *ld, LDAPControl *ctrl );
+static int print_syncdone( LDAP *ld, LDAPControl *ctrl );
+#ifdef LDAP_CONTROL_X_DIRSYNC
+static int print_dirsync( LDAP *ld, LDAPControl *ctrl );
+#endif
+#ifdef LDAP_CONTROL_X_ACCOUNT_USABILITY
+static int print_account_usability( LDAP *ld, LDAPControl *ctrl );
+#endif
+#ifdef LDAP_CONTROL_X_PASSWORD_EXPIRED
+static int print_netscape_pwexpired( LDAP *ld, LDAPControl *ctrl );
+static int print_netscape_pwexpiring( LDAP *ld, LDAPControl *ctrl );
+#endif
 
 static struct tool_ctrls_t {
        const char      *oid;
@@ -161,6 +178,11 @@
        { LDAP_CONTROL_PRE_READ,                        TOOL_ALL,       print_preread },
        { LDAP_CONTROL_POST_READ,                       TOOL_ALL,       print_postread },
        { LDAP_CONTROL_PAGEDRESULTS,                    TOOL_SEARCH,    print_paged_results },
+       { LDAP_CONTROL_PERSIST_ENTRY_CHANGE_NOTICE,                     TOOL_SEARCH,    print_psearch },
+#ifdef LDAP_CONTROL_AUTHZID_RESPONSE
+       /* this is generally deprecated in favor of LDAP WhoAmI? operation, hence only supported as a VC inner control */
+       { LDAP_CONTROL_AUTHZID_RESPONSE,                TOOL_VC,        print_authzid },
+#endif
 #ifdef LDAP_CONTROL_PASSWORDPOLICYREQUEST
        { LDAP_CONTROL_PASSWORDPOLICYRESPONSE,          TOOL_ALL,       print_ppolicy },
 #endif
@@ -172,6 +194,18 @@
 #ifdef LDAP_CONTROL_X_WHATFAILED
        { LDAP_CONTROL_X_WHATFAILED,                    TOOL_ALL,       print_whatfailed },
 #endif
+       { LDAP_CONTROL_SYNC_STATE,                      TOOL_SEARCH,    print_syncstate },
+       { LDAP_CONTROL_SYNC_DONE,                       TOOL_SEARCH,    print_syncdone },
+#ifdef LDAP_CONTROL_X_DIRSYNC
+       { LDAP_CONTROL_X_DIRSYNC,                       TOOL_SEARCH,    print_dirsync },
+#endif
+#ifdef LDAP_CONTROL_X_ACCOUNT_USABILITY
+       { LDAP_CONTROL_X_ACCOUNT_USABILITY,             TOOL_SEARCH,    print_account_usability },
+#endif
+#ifdef LDAP_CONTROL_X_PASSWORD_EXPIRED
+       { LDAP_CONTROL_X_PASSWORD_EXPIRED,              TOOL_ALL,       print_netscape_pwexpired },
+       { LDAP_CONTROL_X_PASSWORD_EXPIRING,             TOOL_ALL,       print_netscape_pwexpiring },
+#endif
        { NULL,                                         0,              NULL }
 };
 
@@ -179,6 +213,8 @@
 enum { Intr_None = 0, Intr_Abandon, Intr_Cancel, Intr_Ignore }; 
 static volatile sig_atomic_t   gotintr, abcan;
 
+int backlog;
+
 
 #ifdef LDAP_CONTROL_X_SESSION_TRACKING
 static int
@@ -201,6 +237,9 @@
                }
        }
 
+       if ( sessionTrackingName != NULL ) {
+               ber_str2bv( sessionTrackingName , 0, 0, &id );
+       } else
 #ifdef HAVE_CYRUS_SASL
        if ( sasl_authz_id != NULL ) {
                ber_str2bv( sasl_authz_id, 0, 0, &id );
@@ -265,45 +304,18 @@
                BER_BVZERO( &pr_cookie );
        }
 
-       if ( binddn != NULL ) {
-               ber_memfree( binddn );
-               binddn = NULL;
-       }
-
        if ( passwd.bv_val != NULL ) {
                ber_memfree( passwd.bv_val );
                BER_BVZERO( &passwd );
        }
 
-       if ( infile != NULL ) {
-               ber_memfree( infile );
-               infile = NULL;
-       }
-
-       if ( assertion ) {
-               ber_memfree( assertion );
-               assertion = NULL;
-       }
-
-       if ( authzid ) {
-               ber_memfree( authzid );
-               authzid = NULL;
+#ifdef LDAP_CONTROL_X_SESSION_TRACKING
+       if ( !BER_BVISNULL( &stValue ) ) {
+               ber_memfree( stValue.bv_val );
+               BER_BVZERO( &stValue );
        }
 
-       if ( proxydn ) {
-               ber_memfree( proxydn );
-               proxydn = NULL;
-       }
-
-       if ( preread_attrs ) {
-               ber_memfree( preread_attrs );
-               preread_attrs = NULL;
-       }
-
-       if ( postread_attrs ) {
-               ber_memfree( postread_attrs );
-               postread_attrs = NULL;
-       }
+#endif /* LDAP_CONTROL_X_SESSION_TRACKING */
 }
 
 void
@@ -315,6 +327,7 @@
 N_("  -e [!]<ext>[=<extparam>] general extensions (! indicates criticality)\n")
 N_("             [!]assert=<filter>     (RFC 4528; a RFC 4515 Filter string)\n")
 N_("             [!]authzid=<authzid>   (RFC 4370; \"dn:<dn>\" or \"u:<user>\")\n")
+N_("             [!]bauthzid            (RFC 3829)\n")
 #ifdef LDAP_CONTROL_OBSOLETE_PROXY_AUTHZ
 #if 0
                  /* non-advertized support for proxyDN */
@@ -335,21 +348,19 @@
 N_("             [!]preread[=<attrs>]   (RFC 4527; comma-separated attr list)\n")
 N_("             [!]relax\n")
 #ifdef LDAP_CONTROL_X_SESSION_TRACKING
-N_("             [!]sessiontracking\n")
+N_("             [!]sessiontracking[=<username>]\n")
 #endif /* LDAP_CONTROL_X_SESSION_TRACKING */
 N_("             abandon, cancel, ignore (SIGINT sends abandon/cancel,\n"
    "             or ignores response; if critical, doesn't wait for SIGINT.\n"
    "             not really controls)\n")
-N_("  -h host    LDAP server\n"),
 N_("  -H URI     LDAP Uniform Resource Identifier(s)\n"),
 N_("  -I         use SASL Interactive mode\n"),
 N_("  -n         show what would be done but don't actually do it\n"),
 N_("  -N         do not use reverse DNS to canonicalize SASL host name\n"),
 N_("  -O props   SASL security properties\n"),
-N_("  -o <opt>[=<optparam>] general options\n"),
+N_("  -o <opt>[=<optparam>] any libldap ldap.conf options, plus\n"),
+N_("             ldif_wrap=<width> (in columns, or \"no\" for no wrapping)\n"),
 N_("             nettimeout=<timeout> (in seconds, or \"none\" or \"max\")\n"),
-N_("             ldif-wrap=<width> (in columns, or \"no\" for no wrapping)\n"),
-N_("  -p port    port on LDAP server\n"),
 N_("  -Q         use SASL Quiet mode\n"),
 N_("  -R realm   SASL realm\n"),
 N_("  -U authcid SASL authentication identity\n"),
@@ -433,7 +444,7 @@
                                fprintf( stderr, "%s: -D previously specified\n", prog );
                                exit( EXIT_FAILURE );
                        }




Home | Main Index | Thread Index | Old Index