Update slurpd(8)

import xmap.c

Fix sorting of message chains with references

Add saftey checksh

Sync with HEAD

Disable anonymous -C for LDAP update tools

Backport -lrewrite fixes (from Ando)
Need to flush CHANGES out (with specific ITS #s)

Ready for release

ITS#2863: top.mk LDBM typo fixed

Return to releng

Fix LDBM typo. Damn.

Ready for release

Should be in releng

ITS#2570, #2726

ITS#2570 TLS retry

ITS#2726 from HEAD - libldbm.a conditional

ITS#2779 group ACL caching

ITS#2779 from HEAD - group ACL caching

ITS#2770, #2773 from HEAD

Import ITS#2770 fix from HEAD - don't use sasl_maxbuf on reads

ITS#2773 typo fix from HEAD

Add BDB 4.2 detection (ITS#2839)

-C clarification from HEAD

Fixed libldap destructor bug (ITS#2758)

ITS#2737: ensure buffer is realloc'ed as necessary

Back port BerElementBuffer changes from HEAD

Fix last commit

Use BerElementBuffer

LBER_ELEMENT_SIZEOF now in lber_pvt.h

Add BerElementBuffer typedef from HEAD

Update release documents

ITS#2822, #2823 man page updates

ITS#2823 ldap_sasl_interactive_bind_s params

ITS#2822 LDAPMOD

ITS#2678, #2781, #2764

ITS#2764 perl LDFLAGS

ITS#2764, #2781 import fixes from HEAD

ITS#2781 skip updateref check whem Multimaster is enabled

ITS#2764 again

ITS#2764 fix perl sed cmd

ITS#2838 sync ldapsasl with HEAD

ITS#2838, sync with HEAD

ITS#2848 BDB 4.2.50 compatibility

Fix ITS#2848 - revert dbcache behavior to REL_ENG_2_1_5.

ITS#2423, #2620 slurpd memory leaks

Minor cleanups for ITS#2620 from HEAD

Import ITS#2423 fix from HEAD, it seems to have been overlooked before

Fix prev commit

ITS#2832 fix from HEAD

Fix prev commit

ITS#2825 SASL internal searches

ITS#2825 fix internal search parameters

ITS#2820 fix from HEAD

ITS#2820 fix from HEAD - fix Draft 4 pthread_create, use pthread_equal

Fix up file:// URLs

ITS#2769 fix from HEAD

Forced commit, prev was ITS#2769

Imported lutil_passwd changes from HEAD

Import lutil_passwd changes from HEAD

Fixed liblber libdir handling (ITS#2797)

ITS#2797: fix libdir bug

Fixed slapd "exact" v "base" handling (ITS#2782)

"exact" and "base" are equivalent

Update CHANGES for 2.1.24 engineering

Import ProxyAuthz fix from HEAD

update for release

Add ITS#2651, removed deprecated code

ITS#2651, delete deprecated code for SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED

Add ITS#2130, 2645, 2678

Fix prev commit, no _ macro in RE21

Fix prev commit, no syncinfo in RE21

ITS#2762: saslplug.h fix

ITS#2762: header include fix

Import ITS#2645 from HEAD

Import ITS#2130, ITS#2678 fix from HEAD

Trim kerberos flags (must now be enabled via environment)

Add LMHASH/MS-MTA-MD5 fixes (ITS#2566/2662)

LANMAN changes from HEAD

Add ITS#2679

Import ITS#2679 fix from HEAD (bad acl caching)

Import some lint removal

Add ITS#2682, #2759 note (back-bdb cache)

Ready for 2.1.23

ITS#2761: fix slurpd pid file handling

clean up sasl test

fix pid/arg file handling

ITS#2759 - Fix LRU manipulation

Import fix from HEAD: crash using proxyAuthz control

Sync with HEAD - use ProxyAuth Control instead of ProxyAuth Bind.
Added starttls config keyword. etc...

ITS#2742, ITS#2423 declare lutil_sasl_freedefs()

ITS#2649 don't defer Abandon requests

Added replica uri (ITS#2594), replica-pidfile, replica-argsfile
Fixed ITS#2691 in contrib/ldapsasl/ldapdb.c putenv() vs setenv()

Fix ldappasswd -y handling (ITS#2696)

fix handling of -y

Should be set for releng

Undo unintended changes in prev commit

Import ITS#2691 patch from HEAD

Merged config patches from HEAD:
ITS#2594 replica uri
replica-pidfile, replica-argfile

Merged config patches from HEAD:
ITS#2594 replica uri
replica-pidfile, replica-argsfile

Fix ITS#2672: add_loop_cnt wasn't counting (re2.1 only)