Update build tools

CHANGES

@@ -4,12 +4,26 @@ OpenLDAP 2.1.6 Engineering
 	Fixed slapd unsupported non-critical control handling
 	Fixed slapd value_find() uninitialized variable bug (ITS#2097)
 	Fixed back-dnssrv default referral handling (ITS#2116)
-	Updated libldap_r Pth support (ITS#724) (ITS#1033)
+	Fixed liblunicode memory leak
+	Fixed slapd listener crash (ITS#2132)
+	Fixed slapd modify mod_add_values crash (ITS#2136)
 	Updated slapd adlist support
+	Updated slapd disallow bind_simple_unprotected
+	Updated back-bdb/ldbm add/delete/rename ACLs
+	Updated libldap_r Pth support (ITS#724) (ITS#1033)
+	Added libldap get referral option
+	Added libldap DIT content rule routines
+	Added back-shell "entry" ACLs
+	Added slapd obsolete checks
 	Disable suffixAlias feature
+	Removed lint
 	Build Environment
 		Fixed back-bdb module linking problem
+		Fixed misc. portability bugs
+		Updated DB_THREAD detection
 		Updated pthreads detection
+		Updated shtool
+		Updated test suite
 	Documentation
 		Misc. updates
 

build/openldap.m4

@@ -401,12 +401,13 @@ main()
 	[ol_cv_berkeley_db_thread=cross])
 
 	LIBS="$ol_LIBS"
+])
 
 	if test $ol_cv_berkeley_db_thread != no ; then
 		AC_DEFINE(HAVE_BERKELEY_DB_THREAD, 1,
 			[define if Berkeley DB has DB_THREAD support])
 	fi
-])])dnl
+])dnl
 dnl
 dnl --------------------------------------------------------------------
 dnl Find any DB
@@ -437,7 +438,7 @@ AC_DEFUN([OL_BDB_COMPAT],
 #if DB_VERSION_MAJOR >= 4 
 	__db_version_compat
 #endif
-	],	[ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
+	], [ol_cv_bdb_compat=yes], [ol_cv_bdb_compat=no])])
 ])
 
 dnl --------------------------------------------------------------------

configure.in

@@ -2251,10 +2251,16 @@ fi
 dnl ----------------------------------------------------------------
 dnl FreeBSD (and others) have crypt(3) in -lcrypt
 if test $ol_enable_crypt != no ; then
+	save_LIBS="$LIBS"
+	LIBS="$TLS_LIBS $LIBS"
+
 	AC_CHECK_FUNC(crypt, [have_crypt=yes], [
+		LIBS="$save_LIBS"
 		AC_CHECK_LIB(crypt, crypt, [LUTIL_LIBS="$LUTIL_LIBS -lcrypt"
 			have_crypt=yes], [have_crypt=no])])
 
+	LIBS="$save_LIBS"
+
 	if test $have_crypt = yes ; then
 		AC_DEFINE(HAVE_CRYPT,1, [define if crypt(3) is available])
 	else

doc/man/man5/slapd.conf.5

@@ -180,7 +180,12 @@ disables acceptance of anonymous bind requests.
 disables simple (bind) authentication.
 .B bind_simple_unprotected
 disables simple (bind) authentication when confidentiality
-protections (e.g. TLS) are not in place.
+protection (e.g. TLS) is not in place.  The
+.B security
+directive's
+.B simple_bind
+option provides fine grain control over the confidentiality
+protection required for simple bind.
 .B bind_krbv4
 disables Kerberos V4 (bind) authentication.
 .B tls_2_anon
@@ -695,6 +700,10 @@ directory updates.
 .B update_sasl=<n>
 specifies the SASL security strength factor to require for
 directory updates.
+.B simple_bind=<n>
+specifies the security strength factor required for
+.I simple
+username/password authentication.
 Note that the
 .B transport
 factor is measure of security provided by the underlying transport,