ready for release

diff --git a/CHANGES b/CHANGES
index 81b3b3c495bd321ee1c15fec566ac84b9d6b4b38..edb0e968ac4fbb061baa93235828556be7114966 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,9 @@
 OpenLDAP 2.3 Change Log
 
-OpenLDAP 2.3.17 Engineering
+OpenLDAP 2.3.17 Release
        Fixed slapd anonymous proxy authorization issue (ITS#4320)
        Fixed slapd-ldap/meta session reuse issue (ITS#4315)
-       Fixed slapd-ldap idassert anon2anon issue (ITS#4321)
+       Fixed slapd-ldap idassert anon-to-anon issue (ITS#4321)
        Fixed slapd-monitor thread issue (ITS#4318)
        Build environment
                Updated Linux sched_yield(2) workaround to use nanosleep(2) (ITS#3950)

diff --git a/configure b/configure
index cbc05478b7813d44dc70e64159926b97423f7b54..d53a987028ae42178393286587a65d4de1e0033c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.23 2006/01/10 01:09:43 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.560.2.24 2006/01/10 17:20:02 kurt Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -24746,6 +24746,108 @@ echo "$as_me: error: pthread_create is not usable, check environment settings" >
                        ol_replace_broken_yield=no
                        case "$target" in
                        *-*-linux*)
+
+for ac_func in nanosleep
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+        { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
                                ol_replace_broken_yield=yes
                        ;;
                        esac

diff --git a/include/portable.hin b/include/portable.hin
index d1576801b671b13f83cfbefef3bf7c819a24e6d5..b7dfb85d782fd4c5ffe2b032d048400f87af4bb0 100644 (file)
--- a/include/portable.hin
+++ b/include/portable.hin
@@ -409,6 +409,9 @@
 /* define this if you have mkversion */
 #undef HAVE_MKVERSION
 
+/* Define to 1 if you have the `nanosleep' function. */
+#undef HAVE_NANOSLEEP
+
 /* define if NDBM is available */
 #undef HAVE_NDBM
 
@@ -978,7 +981,7 @@
 /* define for In-Directory Access Logging overlay */
 #undef SLAPD_OVER_ACCESSLOG
 
-/* define for Dynamic Group overlay */
+/* define for Deny Operation overlay */
 #undef SLAPD_OVER_DENYOP
 
 /* define for Dynamic Group overlay */