Sync with HEAD

diff --cc README
index bbaf0a89876247af16321c012012c7234e24afaf,bbaf0a89876247af16321c012012c7234e24afaf..ea464e1f867849f14320929a840e03b75e0a0b96
--- 1/README
--- 2/README
+++ b/README
@@@ -1,35 -1,35 +1,86 @@@
--OpenLDAP Devel README
--      This software was obtained from the development branch (HEAD) of
--      the OpenLDAP Software Repository.  This copy is likely already
--      not current, the development branch changes frequently.  These
--      changes include code implementing experimental features and
--      unproven bug fixes.  Please do NOT redistribute copies of the
--      development branch.
--
--      The OpenLDAP Developer's FAQ is available at:
--              http://www.openldap.org/faq/index.cgi?file=4
--
--      Client developers seeking a suitable development platform
--      should use "release" or "stable" versions.
--              http://www.openldap.org/software/
--
--Contributing
--
--      See http://www.openldap.org/devel/contributing.html for how to
--      contribute code or documentation to OpenLDAP.  Use the Issue Tracking
--      System <http://www.openldap.org/its/> to submit contributions.
--      While you are encouraged to coordinate and discuss the development
--      activities on the openldap-devel@openldap.org mailing list prior
--      to submission, it is noted that contributions must be submitted
--      using the Issue Tracking System to be considered.
++OpenLDAP 2.3 README
++    For a description of what this distribution contains, see the
++    ANNOUNCEMENT file in this directory.  For a description of
++    changes from previous releases, see the CHANGES file in this
++    directory.
++
++    This is 2.3 release, it includes significant changes from prior
++    releases.
++
++REQUIRED SOFTWARE
++    Building OpenLDAP Software requires a number of software packages
++    to be preinstalled.  Additional information regarding prerequisite
++    software can be found in the OpenLDAP Administrator's Guide.
++
++    Base system (libraries and tools):
++        Standard C compiler (required)
++        Cyrus SASL 2.1.18+ (recommended)
++        OpenSSL 0.9.7+ (recommended)
++        POSIX REGEX software (required)
++
++    SLAPD:
++        BDB backend requires Sleepycat Berkeley DB 4.3
++        LDBM backend requires a compatible database manager
++            [Berkeley DB, GDBM, etc.]
++
++    SLURPD:
++        LTHREAD compatible thread package
++            [POSIX threads, Mach Cthreads, select others]
++
++    CLIENTS/CONTRIB ware:
++        Depends on package.  See per package README.
++
++
++MAKING AND INSTALLING THE DISTRIBUTION
++    Please see the INSTALL file for basic instructions.  More
++    detailed instructions can be found in the OpenLDAP Admnistrator's
++    Guide (see DOCUMENTATION section).
++
++
++DOCUMENTATION
++    There are man pages for most programs in the distribution and
++    routines in the various libraries.  See ldap(3) for details.
++
++    The OpenLDAP website is available and contains the latest LDAP
++    news, releases announcements, pointers to other LDAP resources,
++    etc..  It is located at <http://www.OpenLDAP.org/>.
++
++    The OpenLDAP Administrator's Guide and other documentation is
++    available at <http://www.openldap.org/doc/>.
++
++    The OpenLDAP Software FAQ is available at
++    <http://www.openldap.org/faq/>.
++
++
++SUPPORT / FEEDBACK / PROBLEM REPORTS / DISCUSSIONS
++    OpenLDAP is user supported.  If you have problems, please review
++    the OpenLDAP FAQ <http://www.openldap.org/faq/> and archives
++    of the OpenLDAP-software and OpenLDAP-bugs mailing lists
++    <http://www.openldap.org/lists/>.  If you cannot find the answer,
++    please enquire on the OpenLDAP-software list.
++
++    Issues, such as bug reports, should be reported using our our
++    Issue Tracking System <http://www.OpenLDAP.org/its/>.  Do not
++    use this system for software enquiries.  Please direct these
++    to an appropriate mailing list.
++
++
++CONTRIBUTING
++    See <http://www.openldap.org/devel/contributing.html> for
++    information regarding how to contribute code or documentation
++    to the OpenLDAP Project for inclusion in OpenLDAP Software.
++    While you are encouraged to coordinate and discuss the development
++    activities on the <openldap-devel@openldap.org> mailing list
++    prior to submission, it is noted that contributions must be
++    submitted using the Issue Tracking System
++    <http://www.openldap.org/its/> to be considered.
  
  ---
  $OpenLDAP$
  
  This work is part of OpenLDAP Software <http://www.openldap.org/>.
  
--Copyright 1998-2004 The OpenLDAP Foundation.
--All rights reserved.
++Copyright 1998-2004 The OpenLDAP Foundation.  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without
  modification, are permitted only as authorized by the OpenLDAP

diff --cc configure
index 522dbf21a753ff8b828975ed29a0252789d5c733,522dbf21a753ff8b828975ed29a0252789d5c733..026811eda88bf723a2a49312ff90774990ffd7a7
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1,6 -1,6 +1,6 @@@
  #! /bin/sh
  # $OpenLDAP$
--# from OpenLDAP: pkg/ldap/configure.in,v 1.559 2004/11/30 22:25:26 slim Exp  
++# from OpenLDAP: pkg/ldap/configure.in,v 1.560 2004/12/04 18:48:48 hyc Exp  
  
  # This work is part of OpenLDAP Software <http://www.openldap.org/>.
  #
@@@ -8464,7 -8464,7 +8464,7 @@@ if (XOR (islower (i), ISLOWER (i)) || t
  exit (0); }
  
  EOF
--if { (eval echo configure:8468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:8468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
@@@ -9549,7 -9549,7 +9549,7 @@@ int main(int argc, char *argv
        exit (epfd == -1 ? 1 : 0);
  }
  EOF
--if { (eval echo configure:9553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:9553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    echo "$ac_t""yes" 1>&6
  cat >> confdefs.h <<\EOF
@@@ -9762,7 -9762,7 +9762,7 @@@ els
                        }
                        
  EOF
--if { (eval echo configure:9766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:9766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_nonposix_strerror_r=yes
  else
@@@ -10010,7 -10010,7 +10010,7 @@@ main(
        return rc;
  }
  EOF
--if { (eval echo configure:10014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:10014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_c_posix_regex=yes
  else
@@@ -12190,7 -12190,7 +12190,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:12194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:12194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_create=yes
  else
@@@ -12377,7 -12377,7 +12377,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:12381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:12381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_kthread=yes
  else
@@@ -12569,7 -12569,7 +12569,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:12573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:12573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_pthread=yes
  else
@@@ -12761,7 -12761,7 +12761,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:12765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:12765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_pthreads=yes
  else
@@@ -12953,7 -12953,7 +12953,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:12957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:12957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_mthreads=yes
  else
@@@ -13145,7 -13145,7 +13145,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:13149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:13149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_thread=yes
  else
@@@ -13338,7 -13338,7 +13338,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:13342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:13342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes
  else
@@@ -13530,7 -13530,7 +13530,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:13534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:13534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lpthread_lmach_lexc=yes
  else
@@@ -13723,7 -13723,7 +13723,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:13727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:13727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lib_lpthread_woff=yes
  else
@@@ -13916,7 -13916,7 +13916,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:13920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:13920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lpthread=yes
  else
@@@ -14108,7 -14108,7 +14108,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:14112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:14112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lc_r=yes
  else
@@@ -14301,7 -14301,7 +14301,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:14305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:14305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_threads=yes
  else
@@@ -14494,7 -14494,7 +14494,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:14498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:14498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes
  else
@@@ -14686,7 -14686,7 +14686,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:14690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:14690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lpthreads_lmach_lexc=yes
  else
@@@ -14878,7 -14878,7 +14878,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:14882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:14882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lpthreads_lexc=yes
  else
@@@ -15071,7 -15071,7 +15071,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:15075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:15075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_lib_lpthreads=yes
  else
@@@ -15557,7 -15557,7 +15557,7 @@@ int main(argc, argv
  }
  
  EOF
--if { (eval echo configure:15561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:15561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_create_works=yes
  else
@@@ -15665,7 -15665,7 +15665,7 @@@ int main(argc, argv
        exit(2);
  }
  EOF
--if { (eval echo configure:15669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:15669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_pthread_select_yields=no
  else
@@@ -20732,7 -20732,7 +20732,7 @@@ main(
        return 0;
  }
  EOF
--if { (eval echo configure:20736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:20736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_berkeley_db_version=yes
  else
@@@ -20838,7 -20838,7 +20838,7 @@@ main(
        return rc;
  }
  EOF
--if { (eval echo configure:20842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:20842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_berkeley_db_thread=yes
  else
@@@ -22896,7 -22896,7 +22896,7 @@@ if (XOR (islower (i), ISLOWER (i)) || t
  exit (0); }
  
  EOF
--if { (eval echo configure:22900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:22900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
@@@ -23523,7 -23523,7 +23523,7 @@@ main(
                exit(1);
  }
  EOF
--if { (eval echo configure:23527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:23527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ol_cv_c_upper_lower=no
  else
@@@ -23732,7 -23732,7 +23732,7 @@@ main () 
    exit (u.c[sizeof (long) - 1] == 1);
  }
  EOF
--if { (eval echo configure:23736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:23736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_bigendian=no
  else
@@@ -23964,7 -23964,7 +23964,7 @@@ main(
  }
  
  EOF
--if { (eval echo configure:23968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>&5
++if { (eval echo configure:23968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else