remove wait3 rusage check. Consistently use wait4 instead.

diff --git a/CHANGES b/CHANGES
index ccbd08db8465df821cb8072e2780b34e962abe13..e1df1e47e13dd7215bdedc50750394cdae55ba08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,6 @@ Changes included in OpenLDAP 1.2
        Added slapd logging option
        Added slapd nextid chunking
        Added LDBM DB2 debugging support
-       Added build support for FreeBSD 4.x
        Fixed client SIGPIPE handling
        Fixed configure wait3 handling
        Fixed lber leaking ber_scanf
@@ -19,6 +18,10 @@ Changes included in OpenLDAP 1.2
        Updated slapd alias deref functionality to be optional
        Updated slapd DN handling
        Updated client/tools Kerberos option handling
+       Build environment
+               Added -kthread detection for FreeBSD kernel threads.
+               Added libtool support for FreeBSD 4.x
+               Removed wait3 test.
 
 Changes included in OpenLDAP 1.1.3
        CVS Tag: OPENLDAP_REL_ENG_1_1_3

diff --git a/clients/gopher/go500.c b/clients/gopher/go500.c
index 13b450c4593383452f229445c5eb2702953125a0..60b35b913cb961c5f99015dec316c86e0e97627c 100644 (file)
--- a/clients/gopher/go500.c
+++ b/clients/gopher/go500.c
@@ -321,10 +321,10 @@ wait4child( int sig )
         if ( debug ) printf( "parent: catching child status\n" );
 
 #ifdef HAVE_WAITPID
-       while (waitpid ((pid_t) -1, 0, WAIT_FLAGS) > 0)
+       while (waitpid ((pid_t) -1, (int *) NULL, WAIT_FLAGS) > 0)
                ;       /* NULL */
 #else
-       while ( wait3( &status, WAIT_FLAGS, 0 ) > 0 )
+       while ( wait4((pid_t) -1, &status, WAIT_FLAGS, 0 ) > 0 )
                ;       /* NULL */
 #endif
 

diff --git a/clients/gopher/go500gw.c b/clients/gopher/go500gw.c
index 4cd87ce55b74bf5a7e2376b3e4a2a6ed062d2bba..04ad52ea126d419f9339cf92a482a71dda0b82ca 100644 (file)
--- a/clients/gopher/go500gw.c
+++ b/clients/gopher/go500gw.c
@@ -350,10 +350,10 @@ wait4child( int sig )
        if ( debug ) printf( "parent: catching child status\n" );
 
 #ifdef HAVE_WAITPID
-       while (waitpid ((pid_t) -1, NULL, WAIT_FLAGS) > 0)
+       while (waitpid ((pid_t) -1, (int *) NULL, WAIT_FLAGS) > 0)
                ;       /* NULL */
 #else 
-       while (wait3( &status, WAIT_FLAGS, 0 ) > 0 )
+       while (wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) > 0 )
                ;       /* NULL */
 #endif
 

diff --git a/configure b/configure
index 55cd388e872f0d202fbd0caf9be895f94b26671e..b023705a2cd8817c409952de1bae5be61091b909 100755 (executable)
--- a/configure
+++ b/configure
@@ -6130,7 +6130,7 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
        ol_enable_ldbm=no
 fi
 
-if test $ol_enable_wrappers = yes ; then
+if test $ol_enable_wrappers != no ; then
        echo $ac_n "checking for main in -lwrap""... $ac_c" 1>&6
 echo "configure:6136: checking for main in -lwrap" >&5
 ac_lib_var=`echo wrap'_'main | sed 'y%./+-%__p_%'`
@@ -8045,69 +8045,6 @@ done
 
 fi
 
-echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
-echo "configure:8050: checking for wait3 that fills in rusage" >&5
-if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_wait3_rusage=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 8058 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <stdio.h>
-/* HP-UX has wait3 but does not fill in rusage at all.  */
-main() {
-  struct rusage r;
-  int i;
-  /* Use a field that we can force nonzero --
-     voluntary context switches.
-     For systems like NeXT and OSF/1 that don't set it,
-     also use the system CPU time.  And page faults (I/O) for Linux.  */
-  r.ru_nvcsw = 0;
-  r.ru_stime.tv_sec = 0;
-  r.ru_stime.tv_usec = 0;
-  r.ru_majflt = r.ru_minflt = 0;
-  switch (fork()) {
-  case 0: /* Child.  */
-    sleep(1); /* Give up the CPU.  */
-    _exit(0);
-  case -1: _exit(0); /* What can we do?  */
-  default: /* Parent.  */
-    wait3(&i, 0, &r);
-    sleep(2); /* Avoid "text file busy" from rm on fast HP-UX machines.  */
-    exit(r.ru_nvcsw == 0 && r.ru_majflt == 0 && r.ru_minflt == 0
-        && r.ru_stime.tv_sec == 0 && r.ru_stime.tv_usec == 0);
-  }
-}
-EOF
-if { (eval echo configure:8089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_wait3_rusage=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_wait3_rusage=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_wait3_rusage" 1>&6
-if test $ac_cv_func_wait3_rusage = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_WAIT3 1
-EOF
-
-fi
-
-
 for ac_func in \
        bcopy                   \
        flock                   \
@@ -8139,12 +8076,12 @@ for ac_func in \
 
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8143: checking for $ac_func" >&5
+echo "configure:8080: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8148 "configure"
+#line 8085 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8167,7 +8104,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8195,12 +8132,12 @@ done
 for ac_func in getopt strdup tempnam
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8199: checking for $ac_func" >&5
+echo "configure:8136: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8204 "configure"
+#line 8141 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8223,7 +8160,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8253,13 +8190,13 @@ done
 # Check Configuration
 
 echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6
-echo "configure:8257: checking declaration of sys_errlist" >&5
+echo "configure:8194: checking declaration of sys_errlist" >&5
 if eval "test \"`echo '$''{'ol_cv_dcl_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
        cat > conftest.$ac_ext <<EOF
-#line 8263 "configure"
+#line 8200 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -8269,7 +8206,7 @@ int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:8273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ol_cv_dcl_sys_errlist=yes
 else
@@ -8290,20 +8227,20 @@ if test $ol_cv_dcl_sys_errlist = no ; then
 EOF
 
        echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6
-echo "configure:8294: checking existence of sys_errlist" >&5
+echo "configure:8231: checking existence of sys_errlist" >&5
        if eval "test \"`echo '$''{'ol_cv_have_sys_errlist'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                cat > conftest.$ac_ext <<EOF
-#line 8300 "configure"
+#line 8237 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int main() {
 char *c = (char *) *sys_errlist
 ; return 0; }
 EOF
-if { (eval echo configure:8307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ol_cv_have_sys_errlist=yes
 else

diff --git a/configure.in b/configure.in
index d7441d45a1d7b2fea5b38c3d4c79843de9252f9a..b1a008130f64773c8f6f815fa725c6f47b7191fc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -40,7 +40,6 @@ AC_ARG_WITH(subdir, [  --with-subdir=DIR change default subdirectory used for in
 AC_SUBST(ldap_subdir)dnl
 
 OL_ARG_ENABLE(debug,[  --enable-debug  enable debugging], yes)dnl
-dnl OL_ARG_ENABLE(syslog,[  --enable-syslog    enable syslog support], auto)dnl
 OL_ARG_ENABLE(proctitle,[  --enable-proctitle  enable proctitle support], yes)dnl
 OL_ARG_ENABLE(libui,[  --enable-libui  enable library user interface], yes)dnl
 OL_ARG_ENABLE(cache,[  --enable-cache  enable caching], yes)dnl
@@ -1021,7 +1020,7 @@ if test $ol_link_ldbm = no -a $ol_enable_ldbm != no ; then
        ol_enable_ldbm=no
 fi
 
-if test $ol_enable_wrappers = yes ; then
+if test $ol_enable_wrappers != no ; then
        AC_CHECK_LIB(wrap, main,
                [have_wrappers=yes], [have_wrappers=no])
 
@@ -1186,8 +1185,6 @@ if test $ac_cv_func_vprintf = yes ; then
        AC_CHECK_FUNCS(vsnprintf vsprintf)
 fi
 
-AC_FUNC_WAIT3
-
 AC_CHECK_FUNCS(                \
        bcopy                   \
        flock                   \
@@ -1231,9 +1228,6 @@ dnl Sort out defines
 if test "$ol_enable_debug" != no ; then
        AC_DEFINE(LDAP_DEBUG,1)
 fi
-dnl    if test "$ol_enable_syslog" != no ; then
-dnl            AC_DEFINE(LDAP_SYSLOG,1)
-dnl    fi
 if test "$ol_enable_libui" = yes ; then
        AC_DEFINE(LDAP_LIBUI,1)
 fi

diff --git a/include/portable.h.in b/include/portable.h.in
index 07991cb4f52be727f3f784b289a034a3e1e62565..328c5a69ca57f99aa558112c2550cb2d168b300d 100644 (file)
--- a/include/portable.h.in
+++ b/include/portable.h.in
@@ -47,9 +47,6 @@
 /* Define if you have the vprintf function.  */
 #undef HAVE_VPRINTF
 
-/* Define if you have the wait3 system call.  */
-#undef HAVE_WAIT3
-
 /* Define if on MINIX.  */
 #undef _MINIX
 

diff --git a/servers/ldapd/main.c b/servers/ldapd/main.c
index a36d16ee68fc630263d71ab1e9f8f103c534b04f..f32c05b2207cf9514e0afdf5af9e0c8b167a8037 100644 (file)
--- a/servers/ldapd/main.c
+++ b/servers/ldapd/main.c
@@ -652,10 +652,10 @@ wait4child( int sig )
        Debug( LDAP_DEBUG_TRACE, "parent: catching child status\n", 0, 0, 0 );
 
 #ifdef HAVE_WAITPID
-       while( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) > 0 )
+       while( waitpid( (pid_t) -1, (int *) NULL, WAIT_FLAGS ) > 0 )
                ;       /* NULL */
 #else
-       while ( wait3( &status, WAIT_FLAGS, 0 ) > 0 )
+       while ( wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) > 0 )
                ;       /* NULL */
 #endif
 

diff --git a/servers/slapd/tools/ldbmtest.c b/servers/slapd/tools/ldbmtest.c
index 598e4a11c46b5c3bc510536ee6b59e33b6eac70d..31d43491aeda49bfcc6f4dfb0567c9fd2ae034bb 100644 (file)
--- a/servers/slapd/tools/ldbmtest.c
+++ b/servers/slapd/tools/ldbmtest.c
@@ -537,7 +537,7 @@ edit_entry( char c, Datum *data )
 #ifdef HAVE_WAITPID
        if ( waitpid( (pid_t) -1, NULL, WAIT_FLAGS ) < 0 ) {
 #else
-       if ( wait3( &status, WAIT_FLAGS, 0 ) < 0 ) {
+       if ( wait4( (pid_t) -1, &status, WAIT_FLAGS, 0 ) < 0 ) {
 #endif
                perror( "wait" );
                return;