From: Kurt Zeilenga Date: Mon, 14 Feb 2000 20:57:34 +0000 (+0000) Subject: Another round of changes behind -DSLAPD_SCHEMA_NOT_COMPAT X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~3189 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0dbaf87730ec9afe44dceaa452ae51e1dcaac3e7;p=openldap Another round of changes behind -DSLAPD_SCHEMA_NOT_COMPAT plus these changes unhidden changes: remove now meaning --enable-discreteaci configure option fix ITS#451, slapd filters Add ber_bvecadd() to support above constify ldap_pvt_find_wildcard() and misc slapd routines renamed some slap.h macros likely broken something --- diff --git a/configure b/configure index 0a2771520a..e0bce4c7c9 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # $OpenLDAP$ -# from OpenLDAP: pkg/ldap/configure.in,v 1.289 2000/01/27 18:30:59 kurt Exp +# from OpenLDAP: pkg/ldap/configure.in,v 1.290 2000/01/27 18:34:00 kurt Exp # Copyright 1998-2000 The OpenLDAP Foundation. All Rights Reserved. # @@ -88,8 +88,6 @@ ac_help="$ac_help --enable-rlookups enable reverse lookups (auto)" ac_help="$ac_help --enable-aci enable per-object ACIs (no)" -ac_help="$ac_help - --enable-discreteaci enable discrete rights in ACIs (no)" ac_help="$ac_help --enable-wrappers enable tcp wrapper support (no)" ac_help="$ac_help @@ -676,7 +674,7 @@ echo "Configuring OpenLDAP $OL_VERSION ..." echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:680: checking host system type" >&5 +echo "configure:678: checking host system type" >&5 if test "x$ac_cv_host" = "x" || (test "x$host" != "xNONE" && test "x$host" != "x$ac_cv_host_alias"); then # Make sure we can run config.sub. @@ -717,7 +715,7 @@ host_os=$ac_cv_host_os echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:721: checking target system type" >&5 +echo "configure:719: checking target system type" >&5 if test "x$ac_cv_target" = "x" || (test "x$target" != "xNONE" && test "x$target" != "x$ac_cv_target_alias"); then # Make sure we can run config.sub. @@ -757,7 +755,7 @@ target_os=$ac_cv_target_os echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:761: checking build system type" >&5 +echo "configure:759: checking build system type" >&5 if test "x$ac_cv_build" = "x" || (test "x$build" != "xNONE" && test "x$build" != "x$ac_cv_build_alias"); then # Make sure we can run config.sub. @@ -834,7 +832,7 @@ test "$host_alias" != "$target_alias" && # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:838: checking for a BSD compatible install" >&5 +echo "configure:836: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"\${ac_cv_path_install+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -891,7 +889,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:895: checking whether build environment is sane" >&5 +echo "configure:893: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -952,7 +950,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:956: checking for $ac_word" >&5 +echo "configure:954: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -982,7 +980,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:986: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:984: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1022,7 +1020,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1026: checking for working aclocal" >&5 +echo "configure:1024: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1035,7 +1033,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1039: checking for working autoconf" >&5 +echo "configure:1037: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1048,7 +1046,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1052: checking for working automake" >&5 +echo "configure:1050: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1061,7 +1059,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1065: checking for working autoheader" >&5 +echo "configure:1063: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1074,7 +1072,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1078: checking for working makeinfo" >&5 +echo "configure:1076: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1094,7 +1092,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1098: checking for $ac_word" >&5 +echo "configure:1096: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AMTAR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1145,7 +1143,7 @@ EOF echo $ac_n "checking configure arguments""... $ac_c" 1>&6 -echo "configure:1149: checking configure arguments" >&5 +echo "configure:1147: checking configure arguments" >&5 top_builddir=`pwd` @@ -1774,26 +1772,6 @@ else ol_enable_aci="no" fi # end --enable-aci -# OpenLDAP --enable-discreteaci - # Check whether --enable-discreteaci or --disable-discreteaci was given. -if test "${enable_discreteaci+set}" = set; then - enableval="$enable_discreteaci" - - ol_arg=invalid - for ol_val in auto yes no ; do - if test "$enableval" = "$ol_val" ; then - ol_arg="$ol_val" - fi - done - if test "$ol_arg" = "invalid" ; then - { echo "configure: error: bad value $enableval for --enable-discreteaci" 1>&2; exit 1; } - fi - ol_enable_discreteaci="$ol_arg" - -else - ol_enable_discreteaci="no" -fi -# end --enable-discreteaci # OpenLDAP --enable-wrappers # Check whether --enable-wrappers or --disable-wrappers was given. if test "${enable_wrappers+set}" = set; then @@ -2301,9 +2279,6 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_aci = yes ; then echo "configure: warning: slapd disabled, ignoring --enable-aci argument" 1>&2 fi - if test $ol_enable_discreteaci = yes ; then - echo "configure: warning: slapd disabled, ignoring --enable-discreteaci argument" 1>&2 - fi if test $ol_with_ldbm_api != auto ; then echo "configure: warning: slapd disabled, ignoring --with-ldbm-api argument" 1>&2 fi @@ -2350,7 +2325,6 @@ if test $ol_enable_slapd = no ; then ol_enable_quipu=no ol_enable_rlookups=no ol_enable_aci=no - ol_enable_discreteaci=no ol_enable_wrappers=no ol_enable_dynamic=no @@ -2526,7 +2500,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2530: checking for $ac_word" >&5 +echo "configure:2504: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2578,7 +2552,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2582: checking for $ac_word" >&5 +echo "configure:2556: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2638,7 +2612,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2642: checking for $ac_word" >&5 +echo "configure:2616: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_RANLIB+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2668,7 +2642,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2672: checking for $ac_word" >&5 +echo "configure:2646: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2698,7 +2672,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2702: checking for $ac_word" >&5 +echo "configure:2676: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2749,7 +2723,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2753: checking for $ac_word" >&5 +echo "configure:2727: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2781,7 +2755,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2785: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 +echo "configure:2759: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2792,12 +2766,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2796 "configure" +#line 2770 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2823,12 +2797,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2827: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2801: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2832: checking whether we are using GNU C" >&5 +echo "configure:2806: checking whether we are using GNU C" >&5 if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2837,7 +2811,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2856,7 +2830,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2860: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2834: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2899,7 +2873,7 @@ ac_prog=ld if test "$ac_cv_prog_gcc" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:2903: checking for ld used by GCC" >&5 +echo "configure:2877: checking for ld used by GCC" >&5 ac_prog=`($CC -print-prog-name=ld) 2>&5` case "$ac_prog" in # Accept absolute paths. @@ -2923,10 +2897,10 @@ echo "configure:2903: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:2927: checking for GNU ld" >&5 +echo "configure:2901: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:2930: checking for non-GNU ld" >&5 +echo "configure:2904: checking for non-GNU ld" >&5 fi if eval "test \"\${ac_cv_path_LD+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2962,7 +2936,7 @@ fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:2966: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:2940: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"\${ac_cv_prog_gnu_ld+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2978,7 +2952,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:2982: checking for BSD-compatible nm" >&5 +echo "configure:2956: checking for BSD-compatible nm" >&5 if eval "test \"\${ac_cv_path_NM+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3015,7 +2989,7 @@ echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3019: checking whether ln -s works" >&5 +echo "configure:2993: checking whether ln -s works" >&5 if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3065,8 +3039,8 @@ test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" case "$host" in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3069 "configure"' > conftest.$ac_ext - if { (eval echo configure:3070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 3043 "configure"' > conftest.$ac_ext + if { (eval echo configure:3044: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) LD="${LD-ld} -32" @@ -3087,19 +3061,19 @@ case "$host" in SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:3091: checking whether the C compiler needs -belf" >&5 +echo "configure:3065: checking whether the C compiler needs -belf" >&5 if eval "test \"\${lt_cv_cc_needs_belf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -3122,7 +3096,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3126: checking for $ac_word" >&5 +echo "configure:3100: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3154,7 +3128,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3158: checking for $ac_word" >&5 +echo "configure:3132: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_DLLTOOL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3189,7 +3163,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3193: checking for $ac_word" >&5 +echo "configure:3167: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3221,7 +3195,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3225: checking for $ac_word" >&5 +echo "configure:3199: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AS+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3256,7 +3230,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3260: checking for $ac_word" >&5 +echo "configure:3234: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3288,7 +3262,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3292: checking for $ac_word" >&5 +echo "configure:3266: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_OBJDUMP+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3356,7 +3330,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3360: checking for $ac_word" >&5 +echo "configure:3334: checking for $ac_word" >&5 if eval "test \"\${ac_cv_prog_AWK+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3387,7 +3361,7 @@ done # test for ln hardlink support echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:3391: checking whether ln works" >&5 +echo "configure:3365: checking whether ln works" >&5 if eval "test \"\${ol_cv_prog_LN_H+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3410,7 +3384,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3414: checking whether ln -s works" >&5 +echo "configure:3388: checking whether ln -s works" >&5 if eval "test \"\${ac_cv_prog_LN_S+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3438,7 +3412,7 @@ fi # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3442: checking for $ac_word" >&5 +echo "configure:3416: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_SENDMAIL+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3474,7 +3448,7 @@ fi # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3478: checking for $ac_word" >&5 +echo "configure:3452: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_EDITOR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3510,7 +3484,7 @@ fi # Extract the first word of "finger", so it can be a program name with args. set dummy finger; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3514: checking for $ac_word" >&5 +echo "configure:3488: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_FINGER+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3549,7 +3523,7 @@ if test $ol_enable_perl != no ; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3553: checking for $ac_word" >&5 +echo "configure:3527: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_PERLBIN+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3600,7 +3574,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3604: checking how to run the C preprocessor" >&5 +echo "configure:3578: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3615,13 +3589,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3632,13 +3606,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3649,13 +3623,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3693,9 +3667,9 @@ elif test $cross_compiling = yes -a $ol_enable_x_compile = no; then fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:3697: checking for AIX" >&5 +echo "configure:3671: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:3721: checking for POSIXized ISC" >&5 +echo "configure:3695: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -3739,17 +3713,17 @@ fi ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6 -echo "configure:3743: checking for minix/config.h" >&5 +echo "configure:3717: checking for minix/config.h" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3788,12 +3762,12 @@ fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:3792: checking for Cygwin environment" >&5 +echo "configure:3766: checking for Cygwin environment" >&5 if eval "test \"\${ac_cv_cygwin+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -3820,19 +3794,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:3824: checking for mingw32 environment" >&5 +echo "configure:3798: checking for mingw32 environment" >&5 if eval "test \"\${ac_cv_mingw32+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3848,19 +3822,19 @@ echo "$ac_t""$ac_cv_mingw32" 1>&6 MINGW32= test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for EMX OS/2 environment""... $ac_c" 1>&6 -echo "configure:3852: checking for EMX OS/2 environment" >&5 +echo "configure:3826: checking for EMX OS/2 environment" >&5 if eval "test \"\${ac_cv_emxos2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_emxos2=yes else @@ -3879,7 +3853,7 @@ test "$ac_cv_emxos2" = yes && EMXOS2=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3883: checking for executable suffix" >&5 +echo "configure:3857: checking for executable suffix" >&5 if eval "test \"\${ac_cv_exeext+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3889,7 +3863,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.C | *.o | *.obj | *.xcoff) ;; @@ -3910,13 +3884,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:3914: checking for object suffix" >&5 +echo "configure:3888: checking for object suffix" >&5 if eval "test \"\${ac_cv_objext+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:3920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3894: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -3940,7 +3914,7 @@ EOF echo $ac_n "checking for be_app in -lbe""... $ac_c" 1>&6 -echo "configure:3944: checking for be_app in -lbe" >&5 +echo "configure:3918: checking for be_app in -lbe" >&5 ac_lib_var=`echo be'_'be_app | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3948,7 +3922,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbe -lroot -lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3985,7 +3959,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:3989: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:3963: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"\${am_cv_prog_cc_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4002,7 +3976,7 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO do CC="$ac_save_CC $ac_arg" cat > conftest.$ac_ext < #include @@ -4039,7 +4013,7 @@ return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; ; return 0; } EOF -if { (eval echo configure:4043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_prog_cc_stdc="$ac_arg"; break else @@ -4073,7 +4047,7 @@ if test -z "${MKDEP}"; then OL_MKDEP="${CC-cc}" if test -z "${MKDEP_FLAGS}"; then echo $ac_n "checking for ${OL_MKDEP} depend flag""... $ac_c" 1>&6 -echo "configure:4077: checking for ${OL_MKDEP} depend flag" >&5 +echo "configure:4051: checking for ${OL_MKDEP} depend flag" >&5 if eval "test \"\${ol_cv_mkdep+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4083,7 +4057,7 @@ else cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } \ + if { ac_try='$OL_MKDEP $flag conftest.c'; { (eval echo configure:4061: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } \ | egrep '^conftest\.'"${ac_objext}" >/dev/null 2>&1 then if test ! -f conftest."${ac_object}" ; then @@ -4121,17 +4095,17 @@ if test $ol_enable_modules != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4125: checking for $ac_hdr" >&5 +echo "configure:4099: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4135: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4163,7 +4137,7 @@ done fi echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6 -echo "configure:4167: checking for lt_dlinit in -lltdl" >&5 +echo "configure:4141: checking for lt_dlinit in -lltdl" >&5 ac_lib_var=`echo ltdl'_'lt_dlinit | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4171,7 +4145,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lltdl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4225,13 +4199,13 @@ fi # test for EBCDIC echo $ac_n "checking for EBCDIC""... $ac_c" 1>&6 -echo "configure:4229: checking for EBCDIC" >&5 +echo "configure:4203: checking for EBCDIC" >&5 if eval "test \"\${ol_cv_cpp_ebcdic+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4264,12 +4238,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4268: checking for ANSI C header files" >&5 +echo "configure:4242: checking for ANSI C header files" >&5 if eval "test \"\${ol_cv_header_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4277,7 +4251,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4294,7 +4268,7 @@ rm -f conftest* if test $ol_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4312,7 +4286,7 @@ fi if test $ol_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4333,7 +4307,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #ifndef HAVE_EBCDIC @@ -4351,7 +4325,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4385,12 +4359,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:4389: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4363: checking for $ac_hdr that defines DIR" >&5 if eval "test \"\${ac_cv_header_dirent_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -4398,7 +4372,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4423,7 +4397,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:4427: checking for opendir in -ldir" >&5 +echo "configure:4401: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4431,7 +4405,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4464,7 +4438,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4468: checking for opendir in -lx" >&5 +echo "configure:4442: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4472,7 +4446,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4506,12 +4480,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4510: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:4484: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"\${ac_cv_header_sys_wait_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4527,7 +4501,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4548,12 +4522,12 @@ EOF fi echo $ac_n "checking POSIX termios""... $ac_c" 1>&6 -echo "configure:4552: checking POSIX termios" >&5 +echo "configure:4526: checking POSIX termios" >&5 if eval "test \"\${am_cv_sys_posix_termios+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4563,7 +4537,7 @@ int main() { tcgetattr(0, 0); ; return 0; } EOF -if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_sys_posix_termios=yes else @@ -4579,7 +4553,7 @@ echo "$ac_t""$am_cv_sys_posix_termios" 1>&6 echo $ac_n "checking whether use of TIOCGWINSZ requires sys/ioctl.h""... $ac_c" 1>&6 -echo "configure:4583: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 +echo "configure:4557: checking whether use of TIOCGWINSZ requires sys/ioctl.h" >&5 if eval "test \"\${am_cv_sys_tiocgwinsz_needs_sys_ioctl_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4588,7 +4562,7 @@ else gwinsz_in_termios_h=no if test $am_cv_sys_posix_termios = yes; then cat > conftest.$ac_ext < # include @@ -4608,7 +4582,7 @@ rm -f conftest* if test $gwinsz_in_termios_h = no; then cat > conftest.$ac_ext < # include @@ -4691,17 +4665,17 @@ for ac_hdr in \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4695: checking for $ac_hdr" >&5 +echo "configure:4669: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4731,7 +4705,7 @@ done echo $ac_n "checking for sigset in -lV3""... $ac_c" 1>&6 -echo "configure:4735: checking for sigset in -lV3" >&5 +echo "configure:4709: checking for sigset in -lV3" >&5 ac_lib_var=`echo V3'_'sigset | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4739,7 +4713,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lV3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4780,12 +4754,12 @@ fi if test $ac_cv_header_winsock_h = yes; then echo $ac_n "checking for winsock""... $ac_c" 1>&6 -echo "configure:4784: checking for winsock" >&5 +echo "configure:4758: checking for winsock" >&5 if eval "test \"\${ol_cv_winsock+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -4797,7 +4771,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_winsock=yes else @@ -4825,12 +4799,12 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:4829: checking for socket" >&5 +echo "configure:4803: checking for socket" >&5 if eval "test \"\${ac_cv_func_socket+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -4873,7 +4847,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:4877: checking for main in -lsocket" >&5 +echo "configure:4851: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4881,14 +4855,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4916,7 +4890,7 @@ else fi echo $ac_n "checking for main in -lnet""... $ac_c" 1>&6 -echo "configure:4920: checking for main in -lnet" >&5 +echo "configure:4894: checking for main in -lnet" >&5 ac_lib_var=`echo net'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4924,14 +4898,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4959,7 +4933,7 @@ else fi echo $ac_n "checking for main in -lnsl_s""... $ac_c" 1>&6 -echo "configure:4963: checking for main in -lnsl_s" >&5 +echo "configure:4937: checking for main in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4967,14 +4941,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5002,7 +4976,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5006: checking for main in -lnsl" >&5 +echo "configure:4980: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5010,14 +4984,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5045,7 +5019,7 @@ else fi echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:5049: checking for socket in -linet" >&5 +echo "configure:5023: checking for socket in -linet" >&5 ac_lib_var=`echo inet'_'socket | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5053,7 +5027,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5092,7 +5066,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:5096: checking for main in -lgen" >&5 +echo "configure:5070: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5100,14 +5074,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5139,12 +5113,12 @@ fi echo $ac_n "checking for select""... $ac_c" 1>&6 -echo "configure:5143: checking for select" >&5 +echo "configure:5117: checking for select" >&5 if eval "test \"\${ac_cv_func_select+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_select=yes" else @@ -5191,7 +5165,7 @@ fi if test "${ac_cv_header_winsock_h}" != yes; then echo $ac_n "checking types of arguments for select()""... $ac_c" 1>&6 -echo "configure:5195: checking types of arguments for select()" >&5 +echo "configure:5169: checking types of arguments for select()" >&5 if eval "test \"\${ac_cv_func_select_arg234+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5205,7 +5179,7 @@ else for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do cat > conftest.$ac_ext < @@ -5224,7 +5198,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_not_found=no ; break 3 else @@ -5269,17 +5243,17 @@ for ac_hdr in regex.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5273: checking for $ac_hdr" >&5 +echo "configure:5247: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5309,12 +5283,12 @@ if test "$ac_cv_header_regex_h" != yes ; then { echo "configure: error: POSIX regex.h required." 1>&2; exit 1; } fi echo $ac_n "checking for regfree""... $ac_c" 1>&6 -echo "configure:5313: checking for regfree" >&5 +echo "configure:5287: checking for regfree" >&5 if eval "test \"\${ac_cv_func_regfree+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_regfree=yes" else @@ -5361,7 +5335,7 @@ fi echo $ac_n "checking for compatible POSIX regex""... $ac_c" 1>&6 -echo "configure:5365: checking for compatible POSIX regex" >&5 +echo "configure:5339: checking for compatible POSIX regex" >&5 if eval "test \"\${ol_cv_c_posix_regex+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5370,7 +5344,7 @@ else ol_cv_c_posix_regex=cross else cat > conftest.$ac_ext < @@ -5396,7 +5370,7 @@ main() return rc; } EOF -if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5374: \"$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 @@ -5417,12 +5391,12 @@ if test "$ol_cv_c_posix_regex" = no ; then fi echo $ac_n "checking for res_search""... $ac_c" 1>&6 -echo "configure:5421: checking for res_search" >&5 +echo "configure:5395: checking for res_search" >&5 if eval "test \"\${ac_cv_func_res_search+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_res_search=yes" else @@ -5467,7 +5441,7 @@ fi if test $ac_cv_func_res_search = no ; then echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 -echo "configure:5471: checking for res_search in -lbind" >&5 +echo "configure:5445: checking for res_search in -lbind" >&5 ac_lib_var=`echo bind'_'res_search | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5475,7 +5449,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5518,7 +5492,7 @@ fi if test $ac_cv_func_res_search = no ; then echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -echo "configure:5522: checking for __res_search in -lbind" >&5 +echo "configure:5496: checking for __res_search in -lbind" >&5 ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5526,7 +5500,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5569,7 +5543,7 @@ fi if test $ac_cv_func_res_search = no ; then echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -echo "configure:5573: checking for res_search in -lresolv" >&5 +echo "configure:5547: checking for res_search in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5577,7 +5551,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5635,7 +5609,7 @@ if test $ol_enable_ldapd != no ; then echo "configure: warning: ldapd is not supported and may suffer from bit rot." 1>&2 echo $ac_n "checking for main in -lxtpp""... $ac_c" 1>&6 -echo "configure:5639: checking for main in -lxtpp" >&5 +echo "configure:5613: checking for main in -lxtpp" >&5 ac_lib_var=`echo xtpp'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5643,14 +5617,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lxtpp -lxtdsap -lxtisode -losi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5679,7 +5653,7 @@ else fi echo $ac_n "checking for main in -ldsap""... $ac_c" 1>&6 -echo "configure:5683: checking for main in -ldsap" >&5 +echo "configure:5657: checking for main in -ldsap" >&5 ac_lib_var=`echo dsap'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5687,14 +5661,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldsap -lisode $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5723,7 +5697,7 @@ else fi echo $ac_n "checking for main in -lisode""... $ac_c" 1>&6 -echo "configure:5727: checking for main in -lisode" >&5 +echo "configure:5701: checking for main in -lisode" >&5 ac_lib_var=`echo isode'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5731,14 +5705,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lisode $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5770,7 +5744,7 @@ fi if test $ol_link_isode != no; then echo $ac_n "checking for main in -lpp""... $ac_c" 1>&6 -echo "configure:5774: checking for main in -lpp" >&5 +echo "configure:5748: checking for main in -lpp" >&5 ac_lib_var=`echo pp'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5778,14 +5752,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lpp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5816,7 +5790,7 @@ fi # Extract the first word of "pepsy", so it can be a program name with args. set dummy pepsy; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5820: checking for $ac_word" >&5 +echo "configure:5794: checking for $ac_word" >&5 if eval "test \"\${ac_cv_path_PEPSY+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5855,17 +5829,17 @@ if test $ol_enable_quipu != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5859: checking for $ac_hdr" >&5 +echo "configure:5833: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5913,17 +5887,17 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5917: checking for $ac_hdr" >&5 +echo "configure:5891: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5955,17 +5929,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5959: checking for $ac_hdr" >&5 +echo "configure:5933: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5999,7 +5973,7 @@ done if test $krb5_impl = mit; then echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:6003: checking for main in -lkrb5" >&5 +echo "configure:5977: checking for main in -lkrb5" >&5 ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6007,14 +5981,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6039,7 +6013,7 @@ fi elif test $krb5_impl = heimdal; then echo $ac_n "checking for main in -lkrb5""... $ac_c" 1>&6 -echo "configure:6043: checking for main in -lkrb5" >&5 +echo "configure:6017: checking for main in -lkrb5" >&5 ac_lib_var=`echo krb5'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6047,14 +6021,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb5 -ldes -lasn1 -lroken -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6116,17 +6090,17 @@ if test $ol_link_krb5 = yes -a \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6120: checking for $ac_hdr" >&5 +echo "configure:6094: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6156,7 +6130,7 @@ done if test $ac_cv_header_kerberosIV_krb_h = yes ; then if test $krb5_impl = mit; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:6160: checking for main in -lkrb4" >&5 +echo "configure:6134: checking for main in -lkrb4" >&5 ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6164,14 +6138,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6196,7 +6170,7 @@ fi elif test $krb5_impl = heimdal; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:6200: checking for main in -lkrb4" >&5 +echo "configure:6174: checking for main in -lkrb4" >&5 ac_lib_var=`echo krb4'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6204,14 +6178,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -lkrb5 -ldes -lasn1 -lroken -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6253,7 +6227,7 @@ EOF echo $ac_n "checking for des_debug in Kerberos libraries""... $ac_c" 1>&6 -echo "configure:6257: checking for des_debug in Kerberos libraries" >&5 +echo "configure:6231: checking for des_debug in Kerberos libraries" >&5 if eval "test \"\${ol_cv_var_des_debug+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6261,7 +6235,7 @@ else save_LIBS="$LIBS" LIBS="$KRB4_LIBS $KRB5_LIBS $LIBS" cat > conftest.$ac_ext < @@ -6274,7 +6248,7 @@ des_debug = 1; ; return 0; } EOF -if { (eval echo configure:6278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_var_des_debug=yes else @@ -6313,17 +6287,17 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6317: checking for $ac_hdr" >&5 +echo "configure:6291: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6352,7 +6326,7 @@ done if test $ac_cv_header_krb_h = yes ; then echo $ac_n "checking for main in -lkrb""... $ac_c" 1>&6 -echo "configure:6356: checking for main in -lkrb" >&5 +echo "configure:6330: checking for main in -lkrb" >&5 ac_lib_var=`echo krb'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6360,14 +6334,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6431,17 +6405,17 @@ if test $ol_with_tls != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6435: checking for $ac_hdr" >&5 +echo "configure:6409: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6419: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6470,7 +6444,7 @@ done if test $ac_cv_header_openssl_ssl_h = yes -o $ac_cv_header_ssl_h = yes ; then echo $ac_n "checking for SSLeay_add_ssl_algorithms in -lssl""... $ac_c" 1>&6 -echo "configure:6474: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 +echo "configure:6448: checking for SSLeay_add_ssl_algorithms in -lssl" >&5 ac_lib_var=`echo ssl'_'SSLeay_add_ssl_algorithms | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6478,7 +6452,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6514,7 +6488,7 @@ fi if test $have_ssleay = no ; then echo $ac_n "checking for SSL_library_init in -lssl""... $ac_c" 1>&6 -echo "configure:6518: checking for SSL_library_init in -lssl" >&5 +echo "configure:6492: checking for SSL_library_init in -lssl" >&5 ac_lib_var=`echo ssl'_'SSL_library_init | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6522,7 +6496,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6559,7 +6533,7 @@ fi if test $have_ssleay = no ; then echo $ac_n "checking for ssl3_accept in -lssl""... $ac_c" 1>&6 -echo "configure:6563: checking for ssl3_accept in -lssl" >&5 +echo "configure:6537: checking for ssl3_accept in -lssl" >&5 ac_lib_var=`echo ssl'_'ssl3_accept | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6567,7 +6541,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lssl -lcrypto -lRSAglue -lrsaref $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6638,12 +6612,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6642: checking for $ac_func" >&5 +echo "configure:6616: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6696,19 +6670,19 @@ if test "$ac_cv_func_ctime_r" = no ; then ol_cv_func_ctime_r_nargs=0 else echo $ac_n "checking number of arguments of ctime_r""... $ac_c" 1>&6 -echo "configure:6700: checking number of arguments of ctime_r" >&5 +echo "configure:6674: checking number of arguments of ctime_r" >&5 if eval "test \"\${ol_cv_func_ctime_r_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { time_t ti; char *buffer; ctime_r(&ti,buffer,32); ; return 0; } EOF -if { (eval echo configure:6712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs3=yes else @@ -6720,14 +6694,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { time_t ti; char *buffer; ctime_r(&ti,buffer); ; return 0; } EOF -if { (eval echo configure:6731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_ctime_r_nargs2=yes else @@ -6767,12 +6741,12 @@ fi if test "$ac_cv_func_gethostbyname_r" = yes ; then echo $ac_n "checking number of arguments of gethostbyname_r""... $ac_c" 1>&6 -echo "configure:6771: checking number of arguments of gethostbyname_r" >&5 +echo "configure:6745: checking number of arguments of gethostbyname_r" >&5 if eval "test \"\${ol_cv_func_gethostbyname_r_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6786,7 +6760,7 @@ struct hostent hent; char buffer[BUFSIZE]; buffer, bufsize, &h_errno); ; return 0; } EOF -if { (eval echo configure:6790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyname_r_nargs5=yes else @@ -6798,7 +6772,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -6813,7 +6787,7 @@ struct hostent hent;struct hostent *rhent; &rhent, &h_errno); ; return 0; } EOF -if { (eval echo configure:6817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyname_r_nargs6=yes else @@ -6854,12 +6828,12 @@ fi if test "$ac_cv_func_gethostbyaddr_r" = yes ; then echo $ac_n "checking number of arguments of gethostbyaddr_r""... $ac_c" 1>&6 -echo "configure:6858: checking number of arguments of gethostbyaddr_r" >&5 +echo "configure:6832: checking number of arguments of gethostbyaddr_r" >&5 if eval "test \"\${ol_cv_func_gethostbyaddr_r_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6875,7 +6849,7 @@ struct hostent hent; char buffer[BUFSIZE]; alen, AF_INET, &hent, buffer, bufsize, &h_errno); ; return 0; } EOF -if { (eval echo configure:6879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyaddr_r_nargs7=yes else @@ -6887,7 +6861,7 @@ fi rm -f conftest* cat > conftest.$ac_ext < #include @@ -6905,7 +6879,7 @@ struct hostent hent; &rhent, &h_errno); ; return 0; } EOF -if { (eval echo configure:6909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_func_gethostbyaddr_r_nargs8=yes else @@ -6968,18 +6942,18 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ echo $ac_n "checking for NT Threads""... $ac_c" 1>&6 -echo "configure:6972: checking for NT Threads" >&5 +echo "configure:6946: checking for NT Threads" >&5 if eval "test \"\${ol_cv_nt_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for _beginthread""... $ac_c" 1>&6 -echo "configure:6978: checking for _beginthread" >&5 +echo "configure:6952: checking for _beginthread" >&5 if eval "test \"\${ac_cv_func__beginthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__beginthread=yes" else @@ -7063,17 +7037,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7067: checking for $ac_hdr" >&5 +echo "configure:7041: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7102,13 +7076,13 @@ done if test $ac_cv_header_pthread_h = yes ; then echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6 -echo "configure:7106: checking POSIX thread version" >&5 +echo "configure:7080: checking POSIX thread version" >&5 if eval "test \"\${ol_cv_pthread_version+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7130,7 +7104,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -7183,12 +7157,12 @@ EOF echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6 -echo "configure:7187: checking for LinuxThreads pthread.h" >&5 +echo "configure:7161: checking for LinuxThreads pthread.h" >&5 if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -7215,12 +7189,12 @@ EOF echo $ac_n "checking for GNU Pth pthread.h""... $ac_c" 1>&6 -echo "configure:7219: checking for GNU Pth pthread.h" >&5 +echo "configure:7193: checking for GNU Pth pthread.h" >&5 if eval "test \"\${ol_cv_header_gnu_pth_pthread_h+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef _POSIX_THREAD_IS_GNU_PTH @@ -7249,17 +7223,17 @@ echo "$ac_t""$ol_cv_header_gnu_pth_pthread_h" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7253: checking for $ac_hdr" >&5 +echo "configure:7227: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7289,14 +7263,14 @@ done echo $ac_n "checking for pthread_create in default libraries""... $ac_c" 1>&6 -echo "configure:7293: checking for pthread_create in default libraries" >&5 +echo "configure:7267: checking for pthread_create in default libraries" >&5 if eval "test \"\${ol_cv_pthread_create+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7340,7 +7314,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_create=yes else @@ -7352,7 +7326,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7401,7 +7375,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7379: \"$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 @@ -7426,7 +7400,7 @@ echo "$ac_t""$ol_cv_pthread_create" 1>&6 if test "$ol_link_threads" = no ; then # try -kthread echo $ac_n "checking for pthread link with -kthread""... $ac_c" 1>&6 -echo "configure:7430: checking for pthread link with -kthread" >&5 +echo "configure:7404: checking for pthread link with -kthread" >&5 if eval "test \"\${ol_cv_pthread_kthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7437,7 +7411,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7481,7 +7455,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_kthread=yes else @@ -7493,7 +7467,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7542,7 +7516,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7520: \"$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 @@ -7572,7 +7546,7 @@ fi if test "$ol_link_threads" = no ; then # try -pthread echo $ac_n "checking for pthread link with -pthread""... $ac_c" 1>&6 -echo "configure:7576: checking for pthread link with -pthread" >&5 +echo "configure:7550: checking for pthread link with -pthread" >&5 if eval "test \"\${ol_cv_pthread_pthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7583,7 +7557,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7627,7 +7601,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_pthread=yes else @@ -7639,7 +7613,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7688,7 +7662,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7666: \"$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 @@ -7718,7 +7692,7 @@ fi if test "$ol_link_threads" = no ; then # try -pthreads echo $ac_n "checking for pthread link with -pthreads""... $ac_c" 1>&6 -echo "configure:7722: checking for pthread link with -pthreads" >&5 +echo "configure:7696: checking for pthread link with -pthreads" >&5 if eval "test \"\${ol_cv_pthread_pthreads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7729,7 +7703,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7773,7 +7747,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_pthreads=yes else @@ -7785,7 +7759,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7834,7 +7808,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7812: \"$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 @@ -7864,7 +7838,7 @@ fi if test "$ol_link_threads" = no ; then # try -mthreads echo $ac_n "checking for pthread link with -mthreads""... $ac_c" 1>&6 -echo "configure:7868: checking for pthread link with -mthreads" >&5 +echo "configure:7842: checking for pthread link with -mthreads" >&5 if eval "test \"\${ol_cv_pthread_mthreads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7875,7 +7849,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -7919,7 +7893,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_mthreads=yes else @@ -7931,7 +7905,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -7980,7 +7954,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7958: \"$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 @@ -8010,7 +7984,7 @@ fi if test "$ol_link_threads" = no ; then # try -thread echo $ac_n "checking for pthread link with -thread""... $ac_c" 1>&6 -echo "configure:8014: checking for pthread link with -thread" >&5 +echo "configure:7988: checking for pthread link with -thread" >&5 if eval "test \"\${ol_cv_pthread_thread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8021,7 +7995,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8065,7 +8039,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_thread=yes else @@ -8077,7 +8051,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8126,7 +8100,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8104: \"$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 @@ -8157,7 +8131,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -lmach -lexc -lc_r echo $ac_n "checking for pthread link with -lpthread -lmach -lexc -lc_r""... $ac_c" 1>&6 -echo "configure:8161: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5 +echo "configure:8135: checking for pthread link with -lpthread -lmach -lexc -lc_r" >&5 if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc_lc_r+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8168,7 +8142,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8212,7 +8186,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread_lmach_lexc_lc_r=yes else @@ -8224,7 +8198,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8273,7 +8247,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8251: \"$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 @@ -8303,7 +8277,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -lmach -lexc echo $ac_n "checking for pthread link with -lpthread -lmach -lexc""... $ac_c" 1>&6 -echo "configure:8307: checking for pthread link with -lpthread -lmach -lexc" >&5 +echo "configure:8281: checking for pthread link with -lpthread -lmach -lexc" >&5 if eval "test \"\${ol_cv_pthread_lpthread_lmach_lexc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8314,7 +8288,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8358,7 +8332,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread_lmach_lexc=yes else @@ -8370,7 +8344,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8419,7 +8393,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8397: \"$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 @@ -8450,7 +8424,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread -Wl,-woff,85 echo $ac_n "checking for pthread link with -lpthread -Wl,-woff,85""... $ac_c" 1>&6 -echo "configure:8454: checking for pthread link with -lpthread -Wl,-woff,85" >&5 +echo "configure:8428: checking for pthread link with -lpthread -Wl,-woff,85" >&5 if eval "test \"\${ol_cv_pthread_lib_lpthread_woff+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8461,7 +8435,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8505,7 +8479,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lib_lpthread_woff=yes else @@ -8517,7 +8491,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8566,7 +8540,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8544: \"$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 @@ -8597,7 +8571,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthread echo $ac_n "checking for pthread link with -lpthread""... $ac_c" 1>&6 -echo "configure:8601: checking for pthread link with -lpthread" >&5 +echo "configure:8575: checking for pthread link with -lpthread" >&5 if eval "test \"\${ol_cv_pthread_lpthread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8608,7 +8582,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8652,7 +8626,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthread=yes else @@ -8664,7 +8638,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8713,7 +8687,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8691: \"$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 @@ -8743,7 +8717,7 @@ fi if test "$ol_link_threads" = no ; then # try -lc_r echo $ac_n "checking for pthread link with -lc_r""... $ac_c" 1>&6 -echo "configure:8747: checking for pthread link with -lc_r" >&5 +echo "configure:8721: checking for pthread link with -lc_r" >&5 if eval "test \"\${ol_cv_pthread_lc_r+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8754,7 +8728,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8798,7 +8772,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lc_r=yes else @@ -8810,7 +8784,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -8859,7 +8833,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:8863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8837: \"$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 @@ -8890,7 +8864,7 @@ fi if test "$ol_link_threads" = no ; then # try -threads echo $ac_n "checking for pthread link with -threads""... $ac_c" 1>&6 -echo "configure:8894: checking for pthread link with -threads" >&5 +echo "configure:8868: checking for pthread link with -threads" >&5 if eval "test \"\${ol_cv_pthread_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8901,7 +8875,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -8945,7 +8919,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:8949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_threads=yes else @@ -8957,7 +8931,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9006,7 +8980,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8984: \"$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 @@ -9037,7 +9011,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lmach -lexc -lc_r echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc -lc_r""... $ac_c" 1>&6 -echo "configure:9041: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5 +echo "configure:9015: checking for pthread link with -lpthreads -lmach -lexc -lc_r" >&5 if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc_lc_r+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9048,7 +9022,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9092,7 +9066,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lmach_lexc_lc_r=yes else @@ -9104,7 +9078,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9153,7 +9127,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9131: \"$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 @@ -9183,7 +9157,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lmach -lexc echo $ac_n "checking for pthread link with -lpthreads -lmach -lexc""... $ac_c" 1>&6 -echo "configure:9187: checking for pthread link with -lpthreads -lmach -lexc" >&5 +echo "configure:9161: checking for pthread link with -lpthreads -lmach -lexc" >&5 if eval "test \"\${ol_cv_pthread_lpthreads_lmach_lexc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9194,7 +9168,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9238,7 +9212,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lmach_lexc=yes else @@ -9250,7 +9224,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9299,7 +9273,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9277: \"$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 @@ -9329,7 +9303,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads -lexc echo $ac_n "checking for pthread link with -lpthreads -lexc""... $ac_c" 1>&6 -echo "configure:9333: checking for pthread link with -lpthreads -lexc" >&5 +echo "configure:9307: checking for pthread link with -lpthreads -lexc" >&5 if eval "test \"\${ol_cv_pthread_lpthreads_lexc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9340,7 +9314,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9384,7 +9358,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lpthreads_lexc=yes else @@ -9396,7 +9370,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9445,7 +9419,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9423: \"$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 @@ -9476,7 +9450,7 @@ fi if test "$ol_link_threads" = no ; then # try -lpthreads echo $ac_n "checking for pthread link with -lpthreads""... $ac_c" 1>&6 -echo "configure:9480: checking for pthread link with -lpthreads" >&5 +echo "configure:9454: checking for pthread link with -lpthreads" >&5 if eval "test \"\${ol_cv_pthread_lib_lpthreads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9487,7 +9461,7 @@ else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < @@ -9531,7 +9505,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:9535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_pthread_lib_lpthreads=yes else @@ -9543,7 +9517,7 @@ fi rm -f conftest* else cat > conftest.$ac_ext < @@ -9592,7 +9566,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:9596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9570: \"$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 @@ -9634,12 +9608,12 @@ EOF for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9638: checking for $ac_func" >&5 +echo "configure:9612: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9691,7 +9665,7 @@ done if test $ac_cv_func_sched_yield = no -a \ $ac_cv_func_pthread_yield = no ; then echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6 -echo "configure:9695: checking for sched_yield in -lrt" >&5 +echo "configure:9669: checking for sched_yield in -lrt" >&5 ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9699,7 +9673,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9742,12 +9716,12 @@ fi for ac_func in thr_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9746: checking for $ac_func" >&5 +echo "configure:9720: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9805,12 +9779,12 @@ done for ac_func in pthread_kill do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9809: checking for $ac_func" >&5 +echo "configure:9783: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9860,13 +9834,13 @@ done echo $ac_n "checking for pthread_detach with ""... $ac_c" 1>&6 -echo "configure:9864: checking for pthread_detach with " >&5 +echo "configure:9838: checking for pthread_detach with " >&5 if eval "test \"\${ol_cv_func_pthread_detach+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9878,7 +9852,7 @@ int main() { pthread_detach(NULL); ; return 0; } EOF -if { (eval echo configure:9882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_func_pthread_detach=yes else @@ -9910,12 +9884,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9914: checking for $ac_func" >&5 +echo "configure:9888: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9966,12 +9940,12 @@ done echo $ac_n "checking for pthread_kill_other_threads_np""... $ac_c" 1>&6 -echo "configure:9970: checking for pthread_kill_other_threads_np" >&5 +echo "configure:9944: checking for pthread_kill_other_threads_np" >&5 if eval "test \"\${ac_cv_func_pthread_kill_other_threads_np+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_pthread_kill_other_threads_np=yes" else @@ -10015,7 +9989,7 @@ else fi echo $ac_n "checking for LinuxThreads implementation""... $ac_c" 1>&6 -echo "configure:10019: checking for LinuxThreads implementation" >&5 +echo "configure:9993: checking for LinuxThreads implementation" >&5 if eval "test \"\${ol_cv_sys_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10028,7 +10002,7 @@ echo "$ac_t""$ol_cv_sys_linux_threads" 1>&6 echo $ac_n "checking for LinuxThreads consistency""... $ac_c" 1>&6 -echo "configure:10032: checking for LinuxThreads consistency" >&5 +echo "configure:10006: checking for LinuxThreads consistency" >&5 if eval "test \"\${ol_cv_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10053,7 +10027,7 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6 fi echo $ac_n "checking if pthread_create() works""... $ac_c" 1>&6 -echo "configure:10057: checking if pthread_create() works" >&5 +echo "configure:10031: checking if pthread_create() works" >&5 if eval "test \"\${ol_cv_pthread_create_works+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10062,7 +10036,7 @@ else ol_cv_pthread_create_works=yes else cat > conftest.$ac_ext < @@ -10111,7 +10085,7 @@ int main(argc, argv) } EOF -if { (eval echo configure:10115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10089: \"$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 @@ -10133,7 +10107,7 @@ echo "$ac_t""$ol_cv_pthread_create_works" 1>&6 if test $ol_with_yielding_select = auto ; then echo $ac_n "checking if select yields when using pthreads""... $ac_c" 1>&6 -echo "configure:10137: checking if select yields when using pthreads" >&5 +echo "configure:10111: checking if select yields when using pthreads" >&5 if eval "test \"\${ol_cv_pthread_select_yields+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10142,7 +10116,7 @@ else ol_cv_pthread_select_yields=cross else cat > conftest.$ac_ext < @@ -10218,7 +10192,7 @@ int main(argc, argv) exit(2); } EOF -if { (eval echo configure:10222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10196: \"$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 @@ -10262,17 +10236,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10266: checking for $ac_hdr" >&5 +echo "configure:10240: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10302,12 +10276,12 @@ done ol_with_threads=found echo $ac_n "checking for cthread_fork""... $ac_c" 1>&6 -echo "configure:10306: checking for cthread_fork" >&5 +echo "configure:10280: checking for cthread_fork" >&5 if eval "test \"\${ac_cv_func_cthread_fork+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_cthread_fork=yes" else @@ -10353,7 +10327,7 @@ fi if test $ol_link_threads = no ; then echo $ac_n "checking for cthread_fork with -all_load""... $ac_c" 1>&6 -echo "configure:10357: checking for cthread_fork with -all_load" >&5 +echo "configure:10331: checking for cthread_fork with -all_load" >&5 if eval "test \"\${ol_cv_cthread_all_load+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10361,7 +10335,7 @@ else save_LIBS="$LIBS" LIBS="-all_load $LIBS" cat > conftest.$ac_ext < int main() { @@ -10370,7 +10344,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:10374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_cthread_all_load=yes else @@ -10415,17 +10389,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10419: checking for $ac_hdr" >&5 +echo "configure:10393: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10429: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10454,7 +10428,7 @@ done if test $ac_cv_header_pth_h = yes ; then echo $ac_n "checking for pth_version in -lpth""... $ac_c" 1>&6 -echo "configure:10458: checking for pth_version in -lpth" >&5 +echo "configure:10432: checking for pth_version in -lpth" >&5 ac_lib_var=`echo pth'_'pth_version | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10462,7 +10436,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpth $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10517,17 +10491,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10521: checking for $ac_hdr" >&5 +echo "configure:10495: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10555,7 +10529,7 @@ done if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:10559: checking for thr_create in -lthread" >&5 +echo "configure:10533: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10563,7 +10537,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10614,12 +10588,12 @@ EOF do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10618: checking for $ac_func" >&5 +echo "configure:10592: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10674,17 +10648,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10678: checking for $ac_hdr" >&5 +echo "configure:10652: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10712,7 +10686,7 @@ done if test $ac_cv_header_lwp_lwp_h = yes ; then echo $ac_n "checking for lwp_create in -llwp""... $ac_c" 1>&6 -echo "configure:10716: checking for lwp_create in -llwp" >&5 +echo "configure:10690: checking for lwp_create in -llwp" >&5 ac_lib_var=`echo lwp'_'lwp_create | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10720,7 +10694,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llwp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10784,17 +10758,17 @@ if test $ol_with_threads = manual ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10788: checking for $ac_hdr" >&5 +echo "configure:10762: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10823,12 +10797,12 @@ done for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10827: checking for $ac_func" >&5 +echo "configure:10801: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -10878,12 +10852,12 @@ done echo $ac_n "checking for LinuxThreads pthread.h""... $ac_c" 1>&6 -echo "configure:10882: checking for LinuxThreads pthread.h" >&5 +echo "configure:10856: checking for LinuxThreads pthread.h" >&5 if eval "test \"\${ol_cv_header_linux_threads+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -10913,17 +10887,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10917: checking for $ac_hdr" >&5 +echo "configure:10891: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10953,17 +10927,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10957: checking for $ac_hdr" >&5 +echo "configure:10931: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10993,17 +10967,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10997: checking for $ac_hdr" >&5 +echo "configure:10971: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11062,20 +11036,20 @@ EOF echo $ac_n "checking for thread specific errno""... $ac_c" 1>&6 -echo "configure:11066: checking for thread specific errno" >&5 +echo "configure:11040: checking for thread specific errno" >&5 if eval "test \"\${ol_cv_errno_thread_specific+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { errno = 0; ; return 0; } EOF -if { (eval echo configure:11079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_errno_thread_specific=yes else @@ -11091,20 +11065,20 @@ fi echo "$ac_t""$ol_cv_errno_thread_specific" 1>&6 echo $ac_n "checking for thread specific h_errno""... $ac_c" 1>&6 -echo "configure:11095: checking for thread specific h_errno" >&5 +echo "configure:11069: checking for thread specific h_errno" >&5 if eval "test \"\${ol_cv_h_errno_thread_specific+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { h_errno = 0; ; return 0; } EOF -if { (eval echo configure:11108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_h_errno_thread_specific=yes else @@ -11155,13 +11129,13 @@ fi ol_link_ldbm=no if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then echo $ac_n "checking for DB2 library""... $ac_c" 1>&6 -echo "configure:11159: checking for DB2 library" >&5 +echo "configure:11133: checking for DB2 library" >&5 if eval "test \"\${ol_cv_lib_db2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for db_appexit in -ldb""... $ac_c" 1>&6 -echo "configure:11165: checking for db_appexit in -ldb" >&5 +echo "configure:11139: checking for db_appexit in -ldb" >&5 ac_lib_var=`echo db'_'db_appexit | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11169,7 +11143,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11211,17 +11185,17 @@ for ac_hdr in db.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11215: checking for $ac_hdr" >&5 +echo "configure:11189: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11249,13 +11223,13 @@ done if test $ac_cv_header_db_h = yes ; then echo $ac_n "checking if db.h is DB2""... $ac_c" 1>&6 -echo "configure:11253: checking if db.h is DB2" >&5 +echo "configure:11227: checking if db.h is DB2" >&5 if eval "test \"\${ol_cv_header_db2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -11287,7 +11261,7 @@ fi echo $ac_n "checking for Berkeley DB2""... $ac_c" 1>&6 -echo "configure:11291: checking for Berkeley DB2" >&5 +echo "configure:11265: checking for Berkeley DB2" >&5 if eval "test \"\${ol_cv_berkeley_db2+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11326,7 +11300,7 @@ EOF fi echo $ac_n "checking for DB_THREAD support""... $ac_c" 1>&6 -echo "configure:11330: checking for DB_THREAD support" >&5 +echo "configure:11304: checking for DB_THREAD support" >&5 if eval "test \"\${ol_cv_berkeley_db2_db_thread+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11340,7 +11314,7 @@ else ol_cv_berkeley_db2_db_thread=cross else cat > conftest.$ac_ext < @@ -11364,7 +11338,7 @@ main() return rc; } EOF -if { (eval echo configure:11368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ol_cv_berkeley_db2_db_thread=yes else @@ -11407,7 +11381,7 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then echo $ac_n "checking for Berkeley DB library""... $ac_c" 1>&6 -echo "configure:11411: checking for Berkeley DB library" >&5 +echo "configure:11385: checking for Berkeley DB library" >&5 if eval "test \"\${ol_cv_lib_db+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11416,17 +11390,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11420: checking for $ac_hdr" >&5 +echo "configure:11394: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11454,12 +11428,12 @@ done ol_LIBS="$LIBS" echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:11458: checking for dbopen" >&5 +echo "configure:11432: checking for dbopen" >&5 if eval "test \"\${ac_cv_func_dbopen+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -11502,7 +11476,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6 -echo "configure:11506: checking for dbopen in -ldb1" >&5 +echo "configure:11480: checking for dbopen in -ldb1" >&5 ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11510,7 +11484,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb1 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11541,7 +11515,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:11545: checking for dbopen in -ldb" >&5 +echo "configure:11519: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11549,7 +11523,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11598,17 +11572,17 @@ for ac_hdr in db_185.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11602: checking for $ac_hdr" >&5 +echo "configure:11576: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11644,7 +11618,7 @@ fi echo $ac_n "checking for Berkeley DB""... $ac_c" 1>&6 -echo "configure:11648: checking for Berkeley DB" >&5 +echo "configure:11622: checking for Berkeley DB" >&5 if eval "test \"\${ol_cv_berkeley_db+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11697,17 +11671,17 @@ if test $ol_with_ldbm_api = manual ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11701: checking for $ac_hdr" >&5 +echo "configure:11675: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11742,18 +11716,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = mdbm ; then echo $ac_n "checking for MDBM library""... $ac_c" 1>&6 -echo "configure:11746: checking for MDBM library" >&5 +echo "configure:11720: checking for MDBM library" >&5 if eval "test \"\${ol_cv_lib_mdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for mdbm_set_chain""... $ac_c" 1>&6 -echo "configure:11752: checking for mdbm_set_chain" >&5 +echo "configure:11726: checking for mdbm_set_chain" >&5 if eval "test \"\${ac_cv_func_mdbm_set_chain+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_mdbm_set_chain=yes" else @@ -11796,7 +11770,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for mdbm_set_chain in -lmdbm""... $ac_c" 1>&6 -echo "configure:11800: checking for mdbm_set_chain in -lmdbm" >&5 +echo "configure:11774: checking for mdbm_set_chain in -lmdbm" >&5 ac_lib_var=`echo mdbm'_'mdbm_set_chain | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11804,7 +11778,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11850,17 +11824,17 @@ echo "$ac_t""$ol_cv_lib_mdbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:11854: checking for $ac_hdr" >&5 +echo "configure:11828: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11887,7 +11861,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:11891: checking for db" >&5 +echo "configure:11865: checking for db" >&5 if eval "test \"\${ol_cv_mdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11920,18 +11894,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then echo $ac_n "checking for GDBM library""... $ac_c" 1>&6 -echo "configure:11924: checking for GDBM library" >&5 +echo "configure:11898: checking for GDBM library" >&5 if eval "test \"\${ol_cv_lib_gdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for gdbm_open""... $ac_c" 1>&6 -echo "configure:11930: checking for gdbm_open" >&5 +echo "configure:11904: checking for gdbm_open" >&5 if eval "test \"\${ac_cv_func_gdbm_open+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gdbm_open=yes" else @@ -11974,7 +11948,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:11978: checking for gdbm_open in -lgdbm" >&5 +echo "configure:11952: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11982,7 +11956,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12028,17 +12002,17 @@ echo "$ac_t""$ol_cv_lib_gdbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12032: checking for $ac_hdr" >&5 +echo "configure:12006: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12065,7 +12039,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:12069: checking for db" >&5 +echo "configure:12043: checking for db" >&5 if eval "test \"\${ol_cv_gdbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12099,18 +12073,18 @@ fi if test $ol_with_ldbm_api = ndbm ; then echo $ac_n "checking for NDBM library""... $ac_c" 1>&6 -echo "configure:12103: checking for NDBM library" >&5 +echo "configure:12077: checking for NDBM library" >&5 if eval "test \"\${ol_cv_lib_ndbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:12109: checking for dbm_open" >&5 +echo "configure:12083: checking for dbm_open" >&5 if eval "test \"\${ac_cv_func_dbm_open+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -12153,7 +12127,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:12157: checking for dbm_open in -lndbm" >&5 +echo "configure:12131: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12161,7 +12135,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12192,7 +12166,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:12196: checking for dbm_open in -ldbm" >&5 +echo "configure:12170: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12200,7 +12174,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12248,17 +12222,17 @@ echo "$ac_t""$ol_cv_lib_ndbm" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12252: checking for $ac_hdr" >&5 +echo "configure:12226: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12285,7 +12259,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:12289: checking for db" >&5 +echo "configure:12263: checking for db" >&5 if eval "test \"\${ol_cv_ndbm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12338,17 +12312,17 @@ if test $ol_enable_wrappers != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12342: checking for $ac_hdr" >&5 +echo "configure:12316: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12379,7 +12353,7 @@ done have_wrappers=no else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_wrappers=yes else @@ -12409,7 +12383,7 @@ EOF WRAP_LIBS="-lwrap" echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:12413: checking for main in -lnsl" >&5 +echo "configure:12387: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12417,14 +12391,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12465,12 +12439,12 @@ fi if test $ol_enable_syslog != no ; then echo $ac_n "checking for openlog""... $ac_c" 1>&6 -echo "configure:12469: checking for openlog" >&5 +echo "configure:12443: checking for openlog" >&5 if eval "test \"\${ac_cv_func_openlog+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_openlog=yes" else @@ -12524,17 +12498,17 @@ if test $ol_enable_dmalloc != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12528: checking for $ac_hdr" >&5 +echo "configure:12502: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12561,7 +12535,7 @@ fi done echo $ac_n "checking for dmalloc_shutdown in -ldmalloc""... $ac_c" 1>&6 -echo "configure:12565: checking for dmalloc_shutdown in -ldmalloc" >&5 +echo "configure:12539: checking for dmalloc_shutdown in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_shutdown | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12569,7 +12543,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12614,17 +12588,17 @@ if test $ol_enable_tcl != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12618: checking for $ac_hdr" >&5 +echo "configure:12592: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12656,7 +12630,7 @@ done else for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do echo $ac_n "checking for main in -l$lib""... $ac_c" 1>&6 -echo "configure:12660: checking for main in -l$lib" >&5 +echo "configure:12634: checking for main in -l$lib" >&5 ac_lib_var=`echo $lib'_'main | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12664,14 +12638,14 @@ else ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12715,17 +12689,17 @@ for ac_hdr in termcap.h ncurses.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:12719: checking for $ac_hdr" >&5 +echo "configure:12693: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12754,7 +12728,7 @@ done if test $ol_link_termcap = no ; then echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6 -echo "configure:12758: checking for tputs in -ltermcap" >&5 +echo "configure:12732: checking for tputs in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12762,7 +12736,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12806,7 +12780,7 @@ fi if test $ol_link_termcap = no ; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:12810: checking for initscr in -lncurses" >&5 +echo "configure:12784: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12814,7 +12788,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12868,17 +12842,17 @@ ol_link_sasl=no if test $ol_with_cyrus_sasl != no ; then ac_safe=`echo "sasl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sasl.h""... $ac_c" 1>&6 -echo "configure:12872: checking for sasl.h" >&5 +echo "configure:12846: checking for sasl.h" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:12882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -12902,7 +12876,7 @@ fi if test $ac_cv_header_sasl_h = yes ; then echo $ac_n "checking for sasl_client_init in -lsasl""... $ac_c" 1>&6 -echo "configure:12906: checking for sasl_client_init in -lsasl" >&5 +echo "configure:12880: checking for sasl_client_init in -lsasl" >&5 ac_lib_var=`echo sasl'_'sasl_client_init | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12910,7 +12884,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsasl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12985,13 +12959,13 @@ if test $ol_with_fetch != no ; then ol=$LIBS LIBS="-lfetch -lcom_err $LIBS" echo $ac_n "checking fetch(3) library""... $ac_c" 1>&6 -echo "configure:12989: checking fetch(3) library" >&5 +echo "configure:12963: checking fetch(3) library" >&5 if eval "test \"\${ol_cv_lib_fetch+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -13001,7 +12975,7 @@ int main() { struct url *u = fetchParseURL("file:///"); ; return 0; } EOF -if { (eval echo configure:13005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_lib_fetch=yes else @@ -13039,17 +13013,17 @@ if test $ol_with_readline != no ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13043: checking for $ac_hdr" >&5 +echo "configure:13017: checking for $ac_hdr" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13080,7 +13054,7 @@ done save_LIBS="$LIBS" LIBS="$TERMCAP_LIBS $LIBS" echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -echo "configure:13084: checking for readline in -lreadline" >&5 +echo "configure:13058: checking for readline in -lreadline" >&5 ac_lib_var=`echo readline'_'readline | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13088,7 +13062,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lreadline $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13141,12 +13115,12 @@ fi if test $ol_enable_crypt != no ; then echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:13145: checking for crypt" >&5 +echo "configure:13119: checking for crypt" >&5 if eval "test \"\${ac_cv_func_crypt+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -13189,7 +13163,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:13193: checking for crypt in -lcrypt" >&5 +echo "configure:13167: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13197,7 +13171,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13251,12 +13225,12 @@ fi if test $ol_enable_proctitle != no ; then echo $ac_n "checking for setproctitle""... $ac_c" 1>&6 -echo "configure:13255: checking for setproctitle" >&5 +echo "configure:13229: checking for setproctitle" >&5 if eval "test \"\${ac_cv_func_setproctitle+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_setproctitle=yes" else @@ -13299,7 +13273,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for setproctitle in -lutil""... $ac_c" 1>&6 -echo "configure:13303: checking for setproctitle in -lutil" >&5 +echo "configure:13277: checking for setproctitle in -lutil" >&5 ac_lib_var=`echo util'_'setproctitle | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13307,7 +13281,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13354,12 +13328,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:13358: checking for ANSI C header files" >&5 +echo "configure:13332: checking for ANSI C header files" >&5 if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13367,7 +13341,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13384,7 +13358,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -13402,7 +13376,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -13423,7 +13397,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #if ((' ' & 0x0FF) == 0x020) @@ -13441,7 +13415,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:13445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -13465,12 +13439,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:13469: checking for mode_t" >&5 +echo "configure:13443: checking for mode_t" >&5 if eval "test \"\${ac_cv_type_mode_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13501,12 +13475,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:13505: checking for off_t" >&5 +echo "configure:13479: checking for off_t" >&5 if eval "test \"\${ac_cv_type_off_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13537,12 +13511,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:13541: checking for pid_t" >&5 +echo "configure:13515: checking for pid_t" >&5 if eval "test \"\${ac_cv_type_pid_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13573,19 +13547,19 @@ EOF fi echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6 -echo "configure:13577: checking for ptrdiff_t" >&5 +echo "configure:13551: checking for ptrdiff_t" >&5 if eval "test \"\${am_cv_type_ptrdiff_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ptrdiff_t p ; return 0; } EOF -if { (eval echo configure:13589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_type_ptrdiff_t=yes else @@ -13606,12 +13580,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:13610: checking return type of signal handlers" >&5 +echo "configure:13584: checking return type of signal handlers" >&5 if eval "test \"\${ac_cv_type_signal+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13628,7 +13602,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:13632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -13647,12 +13621,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:13651: checking for size_t" >&5 +echo "configure:13625: checking for size_t" >&5 if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13684,12 +13658,12 @@ fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:13688: checking for ssize_t" >&5 +echo "configure:13662: checking for ssize_t" >&5 if eval "test \"\${ac_cv_type_ssize_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13720,12 +13694,12 @@ EOF fi echo $ac_n "checking for caddr_t""... $ac_c" 1>&6 -echo "configure:13724: checking for caddr_t" >&5 +echo "configure:13698: checking for caddr_t" >&5 if eval "test \"\${ac_cv_type_caddr_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13757,12 +13731,12 @@ fi echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 -echo "configure:13761: checking for socklen_t" >&5 +echo "configure:13735: checking for socklen_t" >&5 if eval "test \"\${ol_cv_type_socklen_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_socklen_t=yes else @@ -13797,12 +13771,12 @@ EOF fi echo $ac_n "checking for member st_blksize in aggregate type struct stat""... $ac_c" 1>&6 -echo "configure:13801: checking for member st_blksize in aggregate type struct stat" >&5 +echo "configure:13775: checking for member st_blksize in aggregate type struct stat" >&5 if eval "test \"\${ac_cv_c_struct_member_st_blksize+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13810,7 +13784,7 @@ int main() { struct stat foo; foo.st_blksize; ; return 0; } EOF -if { (eval echo configure:13814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_struct_member_st_blksize=yes else @@ -13832,12 +13806,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:13836: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:13810: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"\${ac_cv_header_time+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13846,7 +13820,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:13850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -13867,12 +13841,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:13871: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:13845: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"\${ac_cv_struct_tm+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13880,7 +13854,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:13884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -13901,12 +13875,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:13905: checking for uid_t in sys/types.h" >&5 +echo "configure:13879: checking for uid_t in sys/types.h" >&5 if eval "test \"\${ac_cv_type_uid_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -13935,19 +13909,19 @@ EOF fi echo $ac_n "checking for sig_atomic_t""... $ac_c" 1>&6 -echo "configure:13939: checking for sig_atomic_t" >&5 +echo "configure:13913: checking for sig_atomic_t" >&5 if eval "test \"\${ol_cv_type_sig_atomic_t+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { sig_atomic_t atomic; ; return 0; } EOF -if { (eval echo configure:13951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_type_sig_atomic_t=yes else @@ -13971,13 +13945,13 @@ EOF # test for pw_gecos in struct passwd echo $ac_n "checking struct passwd for pw_gecos""... $ac_c" 1>&6 -echo "configure:13975: checking struct passwd for pw_gecos" >&5 +echo "configure:13949: checking struct passwd for pw_gecos" >&5 if eval "test \"\${ol_cv_struct_passwd_pw_gecos+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -13987,7 +13961,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_struct_passwd_pw_gecos=yes else @@ -14009,13 +13983,13 @@ fi # test for pw_passwd in struct passwd echo $ac_n "checking struct passwd for pw_passwd""... $ac_c" 1>&6 -echo "configure:14013: checking struct passwd for pw_passwd" >&5 +echo "configure:13987: checking struct passwd for pw_passwd" >&5 if eval "test \"\${ol_cv_struct_passwd_pw_passwd+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -14025,7 +13999,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_struct_passwd_pw_passwd=yes else @@ -14047,7 +14021,7 @@ fi echo $ac_n "checking if toupper() requires islower()""... $ac_c" 1>&6 -echo "configure:14051: checking if toupper() requires islower()" >&5 +echo "configure:14025: checking if toupper() requires islower()" >&5 if eval "test \"\${ol_cv_c_upper_lower+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14056,7 +14030,7 @@ else ol_cv_c_upper_lower=safe else cat > conftest.$ac_ext < @@ -14068,7 +14042,7 @@ main() exit(1); } EOF -if { (eval echo configure:14072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14046: \"$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 @@ -14091,12 +14065,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:14095: checking for working const" >&5 +echo "configure:14069: checking for working const" >&5 if eval "test \"\${ac_cv_c_const+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -14166,12 +14140,12 @@ EOF fi echo $ac_n "checking if compiler understands volatile""... $ac_c" 1>&6 -echo "configure:14170: checking if compiler understands volatile" >&5 +echo "configure:14144: checking if compiler understands volatile" >&5 if eval "test \"\${ol_cv_c_volatile+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_c_volatile=yes else @@ -14210,14 +14184,14 @@ EOF else echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:14214: checking whether byte ordering is bigendian" >&5 +echo "configure:14188: checking whether byte ordering is bigendian" >&5 if eval "test \"\${ac_cv_c_bigendian+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -14228,11 +14202,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -14243,7 +14217,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:14247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -14263,7 +14237,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14254: \"$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 @@ -14302,13 +14276,13 @@ fi fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:14306: checking size of short" >&5 +echo "configure:14280: checking size of short" >&5 if eval "test \"\${ac_cv_sizeof_short+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -14318,7 +14292,7 @@ int main() { switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:14322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14296: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -14341,13 +14315,13 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:14345: checking size of int" >&5 +echo "configure:14319: checking size of int" >&5 if eval "test \"\${ac_cv_sizeof_int+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -14357,7 +14331,7 @@ int main() { switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:14361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -14380,13 +14354,13 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:14384: checking size of long" >&5 +echo "configure:14358: checking size of long" >&5 if eval "test \"\${ac_cv_sizeof_long+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext < @@ -14396,7 +14370,7 @@ int main() { switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:14400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -14447,7 +14421,7 @@ EOF echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:14451: checking for 8-bit clean memcmp" >&5 +echo "configure:14425: checking for 8-bit clean memcmp" >&5 if eval "test \"\${ac_cv_func_memcmp_clean+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14455,7 +14429,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14443: \"$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 @@ -14483,12 +14457,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:14487: checking for strftime" >&5 +echo "configure:14461: checking for strftime" >&5 if eval "test \"\${ac_cv_func_strftime+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -14534,7 +14508,7 @@ else echo "$ac_t""no" 1>&6 # strftime is in -lintl on SCO UNIX. echo $ac_n "checking for strftime in -lintl""... $ac_c" 1>&6 -echo "configure:14538: checking for strftime in -lintl" >&5 +echo "configure:14512: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-:%__p__%'` if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14542,7 +14516,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14581,12 +14555,12 @@ fi echo $ac_n "checking for inet_aton()""... $ac_c" 1>&6 -echo "configure:14585: checking for inet_aton()" >&5 +echo "configure:14559: checking for inet_aton()" >&5 if eval "test \"\${ol_cv_func_inet_aton+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_func_inet_aton=yes else @@ -14630,12 +14604,12 @@ EOF echo $ac_n "checking for _spawnlp""... $ac_c" 1>&6 -echo "configure:14634: checking for _spawnlp" >&5 +echo "configure:14608: checking for _spawnlp" >&5 if eval "test \"\${ac_cv_func__spawnlp+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__spawnlp=yes" else @@ -14683,12 +14657,12 @@ fi echo $ac_n "checking for _snprintf""... $ac_c" 1>&6 -echo "configure:14687: checking for _snprintf" >&5 +echo "configure:14661: checking for _snprintf" >&5 if eval "test \"\${ac_cv_func__snprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__snprintf=yes" else @@ -14738,12 +14712,12 @@ fi echo $ac_n "checking for _vsnprintf""... $ac_c" 1>&6 -echo "configure:14742: checking for _vsnprintf" >&5 +echo "configure:14716: checking for _vsnprintf" >&5 if eval "test \"\${ac_cv_func__vsnprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__vsnprintf=yes" else @@ -14793,12 +14767,12 @@ fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:14797: checking for vprintf" >&5 +echo "configure:14771: checking for vprintf" >&5 if eval "test \"\${ac_cv_func_vprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -14846,12 +14820,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:14850: checking for _doprnt" >&5 +echo "configure:14824: checking for _doprnt" >&5 if eval "test \"\${ac_cv_func__doprnt+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -14904,12 +14878,12 @@ if test $ac_cv_func_vprintf = yes ; then for ac_func in vsnprintf vsprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14908: checking for $ac_func" >&5 +echo "configure:14882: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15010,12 +14984,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15014: checking for $ac_func" >&5 +echo "configure:14988: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15067,12 +15041,12 @@ done for ac_func in getopt tempnam do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15071: checking for $ac_func" >&5 +echo "configure:15045: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15133,13 +15107,13 @@ fi # Check Configuration echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:15137: checking declaration of sys_errlist" >&5 +echo "configure:15111: checking declaration of sys_errlist" >&5 if eval "test \"\${ol_cv_dcl_sys_errlist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15152,7 +15126,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:15156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_dcl_sys_errlist=yes ol_cv_have_sys_errlist=yes @@ -15175,20 +15149,20 @@ EOF echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6 -echo "configure:15179: checking existence of sys_errlist" >&5 +echo "configure:15153: checking existence of sys_errlist" >&5 if eval "test \"\${ol_cv_have_sys_errlist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:15192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ol_cv_have_sys_errlist=yes else @@ -15313,12 +15287,6 @@ if test "$ol_enable_aci" != no ; then #define SLAPD_ACI_ENABLED 1 EOF -fi -if test "$ol_enable_discreteaci" != no ; then - cat >> confdefs.h <<\EOF -#define SLAPD_ACI_DISCRETE_RIGHTS 1 -EOF - fi if test "$ol_link_modules" != no ; then diff --git a/configure.in b/configure.in index 2964d943cd..e81e607940 100644 --- a/configure.in +++ b/configure.in @@ -141,7 +141,6 @@ OL_ARG_ENABLE(phonetic,[ --enable-phonetic enable phonetic/soundex], no)dnl OL_ARG_ENABLE(quipu,[ --enable-quipu build quipu migration tools], no)dnl OL_ARG_ENABLE(rlookups,[ --enable-rlookups enable reverse lookups], auto)dnl OL_ARG_ENABLE(aci,[ --enable-aci enable per-object ACIs], no)dnl -OL_ARG_ENABLE(discreteaci,[ --enable-discreteaci enable discrete rights in ACIs], no)dnl OL_ARG_ENABLE(wrappers,[ --enable-wrappers enable tcp wrapper support], no)dnl OL_ARG_ENABLE(dynamic,[ --enable-dynamic enable linking built binaries with dynamic libs], no)dnl @@ -242,9 +241,6 @@ if test $ol_enable_slapd = no ; then if test $ol_enable_aci = yes ; then AC_MSG_WARN([slapd disabled, ignoring --enable-aci argument]) fi - if test $ol_enable_discreteaci = yes ; then - AC_MSG_WARN([slapd disabled, ignoring --enable-discreteaci argument]) - fi if test $ol_with_ldbm_api != auto ; then AC_MSG_WARN([slapd disabled, ignoring --with-ldbm-api argument]) fi @@ -291,7 +287,6 @@ if test $ol_enable_slapd = no ; then ol_enable_quipu=no ol_enable_rlookups=no ol_enable_aci=no - ol_enable_discreteaci=no ol_enable_wrappers=no ol_enable_dynamic=no @@ -2206,9 +2201,6 @@ fi if test "$ol_enable_aci" != no ; then AC_DEFINE(SLAPD_ACI_ENABLED,1,[define to support per-object ACIs]) fi -if test "$ol_enable_discreteaci" != no ; then - AC_DEFINE(SLAPD_ACI_DISCRETE_RIGHTS,1,[define to support discrete rights in ACIs]) -fi if test "$ol_link_modules" != no ; then AC_DEFINE(SLAPD_MODULES,1,[define to support modules]) diff --git a/include/lber.h b/include/lber.h index 12a152f141..4f3cebc245 100644 --- a/include/lber.h +++ b/include/lber.h @@ -466,6 +466,11 @@ LIBLBER_F( void ) ber_bvecfree LDAP_P(( struct berval **bv )); +LIBLBER_F( int ) +ber_bvecadd LDAP_P(( + struct berval ***bvec, + struct berval *bv )); + LIBLBER_F( struct berval * ) ber_bvdup LDAP_P(( LDAP_CONST struct berval *bv )); diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index c969243695..660fa1d612 100644 --- a/include/ldap_pvt.h +++ b/include/ldap_pvt.h @@ -119,7 +119,7 @@ LIBLDAP_F (int) ldap_pvt_sasl_bind LDAP_P(( LDAP *, LDAP_CONST char *, LDAP_CONS /* search.c */ LIBLDAP_F( char * ) -ldap_pvt_find_wildcard LDAP_P(( char *s )); +ldap_pvt_find_wildcard LDAP_P(( const char *s )); LIBLDAP_F( ber_slen_t ) ldap_pvt_filter_value_unescape LDAP_P(( char *filter )); diff --git a/include/portable.h.in b/include/portable.h.in index e03f655d62..22615384d6 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -886,9 +886,6 @@ /* define to support per-object ACIs */ #undef SLAPD_ACI_ENABLED -/* define to support discrete rights in ACIs */ -#undef SLAPD_ACI_DISCRETE_RIGHTS - /* define to support modules */ #undef SLAPD_MODULES diff --git a/libraries/liblber/memory.c b/libraries/liblber/memory.c index 372124c778..334ee9acfe 100644 --- a/libraries/liblber/memory.c +++ b/libraries/liblber/memory.c @@ -270,6 +270,57 @@ ber_bvecfree( struct berval **bv ) LBER_FREE( (char *) bv ); } +int +ber_bvecadd( struct berval ***bvec, struct berval *bv ) +{ + ber_len_t i; + struct berval **new; + + ber_int_options.lbo_valid = LBER_INITIALIZED; + + if( bvec == NULL ) { + if( bv == NULL ) { + /* nothing to add */ + return 0; + } + + *bvec = ber_memalloc( 2 * sizeof(struct berval *) ); + + if( *bvec == NULL ) { + return -1; + } + + (*bvec)[0] = bv; + (*bvec)[1] = NULL; + + return 1; + } + + BER_MEM_VALID( bvec ); + + /* count entries */ + for ( i = 0; bvec[i] != NULL; i++ ) { + /* EMPTY */; + } + + if( bv == NULL ) { + return i; + } + + new = ber_memrealloc( *bvec, (i+2) * sizeof(struct berval *)); + + if( new == NULL ) { + return -1; + } + + *bvec = new; + + (*bvec)[i++] = bv; + (*bvec)[i] = NULL; + + return i; +} + struct berval * ber_bvdup( diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c index 84a58f3b02..7aec3efcb8 100644 --- a/libraries/libldap/search.c +++ b/libraries/libldap/search.c @@ -424,12 +424,12 @@ static int hex2value( int c ) } char * -ldap_pvt_find_wildcard( char *s ) +ldap_pvt_find_wildcard( const char *s ) { for( ; *s != '\0' ; s++ ) { switch( *s ) { case '*': /* found wildcard */ - return s; + return (char *) s; case '\\': s++; /* skip over escape */ diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c index e026af3d2c..e43902aa64 100644 --- a/servers/slapd/acl.c +++ b/servers/slapd/acl.c @@ -18,20 +18,37 @@ static AccessControl * acl_get( AccessControl *ac, int *count, Backend *be, Operation *op, - Entry *e, char *attr, + Entry *e, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeType *type, +#else + const char *attr, +#endif int nmatches, regmatch_t *matches ); static slap_control_t acl_mask( AccessControl *ac, slap_access_mask_t *mask, Backend *be, Connection *conn, Operation *op, - Entry *e, char *attr, struct berval *val, + Entry *e, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeType *type, +#else + const char *attr, +#endif + struct berval *val, regmatch_t *matches ); #ifdef SLAPD_ACI_ENABLED static int aci_mask( Backend *be, Operation *op, - Entry *e, char *attr, struct berval *val, struct berval *aci, + Entry *e, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeType *type, +#else + const char *attr, +#endif + struct berval *val, struct berval *aci, regmatch_t *matches, slap_access_t *grant, slap_access_t *deny ); char *supportedACIMechs[] = { @@ -41,8 +58,10 @@ char *supportedACIMechs[] = { }; #endif -static int regex_matches(char *pat, char *str, char *buf, regmatch_t *matches); -static void string_expand(char *newbuf, int bufsiz, char *pattern, +static int regex_matches( + char *pat, char *str, char *buf, regmatch_t *matches); +static void string_expand( + char *newbuf, int bufsiz, char *pattern, char *match, regmatch_t *matches); @@ -67,10 +86,13 @@ access_allowed( Connection *conn, Operation *op, Entry *e, - char *attr, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeType *attr, +#else + const char *attr, +#endif struct berval *val, - slap_access_t access -) + slap_access_t access ) { int count; AccessControl *a; @@ -105,7 +127,12 @@ access_allowed( * by ACL_WRITE checking as any found here are not provided * by the user */ - if ( access >= ACL_WRITE && oc_check_op_no_usermod_attr( attr ) ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if ( access >= ACL_WRITE && is_at_no_user_mod( attr ) ) +#else + if ( access >= ACL_WRITE && oc_check_op_no_usermod_attr( attr ) ) +#endif + { Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:" " %s access granted\n", attr, 0, 0 ); @@ -202,10 +229,13 @@ acl_get( Backend *be, Operation *op, Entry *e, - char *attr, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeType *attr, +#else + const char *attr, +#endif int nmatch, - regmatch_t *matches -) + regmatch_t *matches ) { assert( e != NULL ); assert( count != NULL ); @@ -282,7 +312,11 @@ acl_mask( Connection *conn, Operation *op, Entry *e, - char *attr, +#ifdef SLAPD_SCHEMA_NOT_COMPAT + AttributeType *attr, +#else + const char *attr, +#endif struct berval *val, regmatch_t *matches ) @@ -398,7 +432,6 @@ acl_mask( } if ( b->a_dn_at != NULL && op->o_ndn != NULL ) { - char *dn_at; Attribute *at; struct berval bv; @@ -408,14 +441,8 @@ acl_mask( bv.bv_val = op->o_ndn; bv.bv_len = strlen( bv.bv_val ); -#ifdef SLAPD_SCHEMA_NOT_COMPAT - dn_at = at_canonical_name( b->a_dn_at ); -#else - dn_at = b->a_dn_at; -#endif - /* see if asker is listed in dnattr */ - if ( (at = attr_find( e->e_attrs, dn_at )) != NULL + if ( (at = attr_find( e->e_attrs, b->a_dn_at )) != NULL #ifdef SLAPD_SCHEMA_NOT_COMPAT /* not yet implemented */ #else @@ -714,7 +741,7 @@ acl_check_modlist( #ifdef SLAPD_ACI_ENABLED static char * -aci_bvstrdup (struct berval *bv) +aci_bvstrdup( struct berval *bv ) { char *s; @@ -727,7 +754,9 @@ aci_bvstrdup (struct berval *bv) } static int -aci_strbvcmp (char *s, struct berval *bv) +aci_strbvcmp( + const char *s, + struct berval *bv ) { int res, len; @@ -743,7 +772,11 @@ aci_strbvcmp (char *s, struct berval *bv) } static int -aci_get_part (struct berval *list, int ix, char sep, struct berval *bv) +aci_get_part( + struct berval *list, + int ix, + char sep, + struct berval *bv ) { int len; char *p; @@ -778,8 +811,8 @@ aci_get_part (struct berval *list, int ix, char sep, struct berval *bv) } static int -aci_list_map_rights ( - struct berval *list) +aci_list_map_rights( + struct berval *list ) { struct berval bv; slap_access_t mask; @@ -823,7 +856,10 @@ aci_list_map_rights ( } static int -aci_list_has_attr (struct berval *list, char *attr, struct berval *val) +aci_list_has_attr( + struct berval *list, + const char *attr, + struct berval *val ) { struct berval bv, left, right; int i; @@ -869,7 +905,10 @@ aci_list_has_attr (struct berval *list, char *attr, struct berval *val) } static slap_access_t -aci_list_get_attr_rights (struct berval *list, char *attr, struct berval *val) +aci_list_get_attr_rights( + struct berval *list, + const char *attr, + struct berval *val ) { struct berval bv; slap_access_t mask; @@ -888,12 +927,12 @@ aci_list_get_attr_rights (struct berval *list, char *attr, struct berval *val) } static int -aci_list_get_rights ( +aci_list_get_rights( struct berval *list, - char *attr, + const char *attr, struct berval *val, slap_access_t *grant, - slap_access_t *deny) + slap_access_t *deny ) { struct berval perm, actn; slap_access_t *mask; @@ -974,11 +1013,11 @@ aci_group_member ( } static int -aci_mask ( +aci_mask( Backend *be, Operation *op, Entry *e, - char *attr, + const char *attr, struct berval *val, struct berval *aci, regmatch_t *matches, @@ -1063,8 +1102,12 @@ aci_mask ( bv.bv_val = op->o_ndn; bv.bv_len = strlen( bv.bv_val ); +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not yet implemented */ +#else if (value_find( at->a_vals, &bv, at->a_syntax, 3 ) == 0 ) return(1); +#endif } } else if (aci_strbvcmp( "group", &bv ) == 0) { @@ -1080,7 +1123,8 @@ aci_mask ( } char * -get_supported_acimech (int index) +get_supported_acimech( + int index ) { if (index < 0 || index >= (sizeof(supportedACIMechs) / sizeof(char *))) return(NULL); diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c index d7fa597360..8724c9a400 100644 --- a/servers/slapd/aclparse.c +++ b/servers/slapd/aclparse.c @@ -1,4 +1,4 @@ -/* acl.c - routines to parse and check acl's */ +/* aclparse.c - routines to parse and check acl's */ /* $OpenLDAP$ */ /* * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. @@ -95,6 +95,12 @@ parse_acl( char *left, *right; AccessControl *a; Access *b; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + int rc; + char *text; + static AttributeDescription *member = NULL; + static AttributeDescription *aci = NULL; +#endif a = NULL; for ( i = 1; i < argc; i++ ) { @@ -321,17 +327,17 @@ parse_acl( } #ifdef SLAPD_SCHEMA_NOT_COMPAT - b->a_dn_at = at_find( right ); + rc = slap_str2ad( right, &b->a_dn_at, &text ); - if( b->a_dn_at == NULL ) { + if( rc != LDAP_SUCCESS ) { fprintf( stderr, - "%s: line %d: dnattr attribute type undefined.\n", - fname, lineno ); + "%s: line %d: dnattr \"%s\": %s\n", + fname, lineno, right, text ); acl_usage(); } #ifdef SLAPD_OID_DN_SYNTAX - if( strcmp( b->a_dn_at->sat_syntax_oid, + if( strcmp( b->a_dn_at->ad_type->sat_syntax_oid, SLAPD_OID_DN_SYNTAX ) != 0 ) { fprintf( stderr, @@ -379,7 +385,14 @@ parse_acl( if (name && *name) { #ifdef SLAPD_SCHEMA_NOT_COMPAT - b->a_group_at = at_find( name ); + rc = slap_str2ad( right, &b->a_group_at, &text ); + + if( rc != LDAP_SUCCESS ) { + fprintf( stderr, + "%s: line %d: group \"%s\": %s\n", + fname, lineno, right, text ); + acl_usage(); + } #else b->a_group_at = ch_strdup(name); #endif @@ -387,7 +400,7 @@ parse_acl( } else { #ifdef SLAPD_SCHEMA_NOT_COMPAT - b->a_group_at = at_find("member"); + b->a_group_at = member; #else b->a_group_at = ch_strdup("member"); #endif @@ -402,7 +415,7 @@ parse_acl( } #ifdef SLAPD_OID_DN_SYNTAX - if( strcmp( b->a_group_at->sat_syntax_oid, + if( strcmp( b->a_group_at->ad_type->sat_syntax_oid, SLAPD_OID_DN_SYNTAX ) != 0 ) { fprintf( stderr, @@ -478,9 +491,16 @@ parse_acl( #ifdef SLAPD_SCHEMA_NOT_COMPAT if ( right != NULL && *right != '\0' ) { - b->a_aci_at = at_find( right ); + rc = slap_str2ad( right, &b->a_aci_at, &text ); + + if( rc != LDAP_SUCCESS ) { + fprintf( stderr, + "%s: line %d: aci \"%s\": %s\n", + fname, lineno, right, text ); + acl_usage(); + } } else { - b->a_aci_at = at_find( SLAPD_ACI_DEFAULT_ATTR ); + b->a_aci_at = aci; } if( b->a_aci_at == NULL ) { @@ -490,7 +510,7 @@ parse_acl( acl_usage(); } - if( strcmp( b->a_aci_at->sat_syntax_oid, + if( strcmp( b->a_aci_at->ad_type->sat_syntax_oid, SLAPD_OID_ACI_SYNTAX ) != 0 ) { fprintf( stderr, diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c index db715584e3..0ec81df544 100644 --- a/servers/slapd/ad.c +++ b/servers/slapd/ad.c @@ -20,6 +20,35 @@ #ifdef SLAPD_SCHEMA_NOT_COMPAT +static int ad_keystring( + struct berval *bv ) +{ + ber_len_t i; + + if( !AD_CHAR( bv->bv_val[0] ) ) { + return 1; + } + + for( i=1; ibv_len; i++ ) { + if( !AD_CHAR( bv->bv_val[i] ) ) { + return 1; + } + } + return 0; +} + +int slap_str2ad( + const char *str, + AttributeDescription **ad, + char **text ) +{ + struct berval bv; + bv.bv_val = (char *) str; + bv.bv_len = strlen( str ); + + return slap_bv2ad( &bv, ad, text ); +} + int slap_bv2ad( struct berval *bv, AttributeDescription **ad, @@ -39,8 +68,8 @@ int slap_bv2ad( } /* make sure description is IA5 */ - if( IA5StringValidate( NULL, bv ) != 0 ) { - *text = "attribute description contains non-IA5 characters"; + if( ad_keystring( bv ) ) { + *text = "attribute description contains inappropriate characters"; return LDAP_UNDEFINED_TYPE; } diff --git a/servers/slapd/at.c b/servers/slapd/at.c index 3866108548..deca47d695 100644 --- a/servers/slapd/at.c +++ b/servers/slapd/at.c @@ -65,7 +65,7 @@ attr_syntax( const char *type ) */ void -attr_syntax_config( +at_config( const char *fname, int lineno, int argc, @@ -166,7 +166,7 @@ at_fake_if_needed( argv[0] = (char*) name; argv[1] = "cis"; argv[2] = NULL; - attr_syntax_config( "implicit", 0, 2, argv ); + at_config( "implicit", 0, 2, argv ); return 0; } } diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c index 353eed131c..b064c92b2b 100644 --- a/servers/slapd/attr.c +++ b/servers/slapd/attr.c @@ -30,7 +30,6 @@ void attr_free( Attribute *a ) { #ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ ad_free( &a->a_desc, 0 ); #else free( a->a_type ); @@ -80,7 +79,6 @@ Attribute *attr_dup( Attribute *a ) } #ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ tmp->a_desc = a->a_desc; tmp->a_desc.ad_cname = ber_bvdup( a->a_desc.ad_cname ); tmp->a_desc.ad_lang = ch_strdup( a->a_desc.ad_lang ); @@ -183,8 +181,7 @@ int attr_merge( Entry *e, const char *type, - struct berval **vals -) + struct berval **vals ) { Attribute **a; diff --git a/servers/slapd/back-ldbm/add.c b/servers/slapd/back-ldbm/add.c index fce939ddd2..44c70c63cf 100644 --- a/servers/slapd/back-ldbm/add.c +++ b/servers/slapd/back-ldbm/add.c @@ -30,6 +30,13 @@ ldbm_back_add( int rootlock = 0; int rc; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *children = NULL; +#else + static const char *children = "children"; +#endif + + Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_add: %s\n", e->e_dn, 0, 0); /* nobody else can add until we lock our parent */ @@ -109,7 +116,7 @@ ldbm_back_add( free(pdn); if ( ! access_allowed( be, conn, op, p, - "children", NULL, ACL_WRITE ) ) + children, NULL, ACL_WRITE ) ) { /* free parent and writer lock */ cache_return_entry_w( &li->li_cache, p ); diff --git a/servers/slapd/back-ldbm/alias.c b/servers/slapd/back-ldbm/alias.c index bb41e99aeb..149a102819 100644 --- a/servers/slapd/back-ldbm/alias.c +++ b/servers/slapd/back-ldbm/alias.c @@ -215,7 +215,14 @@ static char* get_alias_dn( int *err, char **errmsg ) { - Attribute *a = attr_find( e->e_attrs, "aliasedobjectname" ); + Attribute *a; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *aliasedObjectName = NULL; +#else + static const char *aliasedObjectName = NULL; +#endif + + a = attr_find( e->e_attrs, aliasedObjectName ); if( a == NULL ) { /* diff --git a/servers/slapd/back-ldbm/bind.c b/servers/slapd/back-ldbm/bind.c index d93537a268..a01d3526c2 100644 --- a/servers/slapd/back-ldbm/bind.c +++ b/servers/slapd/back-ldbm/bind.c @@ -41,6 +41,14 @@ ldbm_back_bind( AUTH_DAT ad; #endif +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *userPassword = NULL; + static AttributeDescription *entry = NULL; +#else + static const char *userPassword = "userpassword"; + static const char *entry = "entry"; +#endif + Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_bind: dn: %s\n", dn, 0, 0); *edn = NULL; @@ -120,7 +128,7 @@ ldbm_back_bind( /* check for deleted */ if ( ! access_allowed( be, conn, op, e, - "entry", NULL, ACL_AUTH ) ) + entry, NULL, ACL_AUTH ) ) { send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, NULL, NULL, NULL, NULL ); @@ -184,7 +192,7 @@ ldbm_back_bind( } if ( ! access_allowed( be, conn, op, e, - "userpassword", NULL, ACL_AUTH ) ) + userPassword, NULL, ACL_AUTH ) ) { send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS, NULL, NULL, NULL, NULL ); @@ -192,7 +200,7 @@ ldbm_back_bind( goto return_results; } - if ( (a = attr_find( e->e_attrs, "userpassword" )) == NULL ) { + if ( (a = attr_find( e->e_attrs, userPassword )) == NULL ) { send_ldap_result( conn, op, LDAP_INAPPROPRIATE_AUTH, NULL, NULL, NULL, NULL ); diff --git a/servers/slapd/back-ldbm/compare.c b/servers/slapd/back-ldbm/compare.c index bc62dfbb3d..f594a2b83b 100644 --- a/servers/slapd/back-ldbm/compare.c +++ b/servers/slapd/back-ldbm/compare.c @@ -82,7 +82,7 @@ ldbm_back_compare( #ifdef SLAPD_SCHEMA_NOT_COMPAT if ( ! access_allowed( be, conn, op, e, - ava->aa_desc->ad_type->sat_cname, ava->aa_value, ACL_COMPARE ) ) + ava->aa_desc, ava->aa_value, ACL_COMPARE ) ) #else if ( ! access_allowed( be, conn, op, e, ava->ava_type, &ava->ava_value, ACL_COMPARE ) ) @@ -95,7 +95,7 @@ ldbm_back_compare( } #ifdef SLAPD_SCHEMA_NOT_COMPAT - if ( (a = attr_find( e->e_attrs, ava->aa_desc->ad_cname->bv_val )) == NULL ) + if ( (a = attr_find( e->e_attrs, ava->aa_desc )) == NULL ) #else if ( (a = attr_find( e->e_attrs, ava->ava_type )) == NULL ) #endif diff --git a/servers/slapd/back-ldbm/delete.c b/servers/slapd/back-ldbm/delete.c index 19437912fa..ab35a12a04 100644 --- a/servers/slapd/back-ldbm/delete.c +++ b/servers/slapd/back-ldbm/delete.c @@ -32,6 +32,11 @@ ldbm_back_delete( int rootlock = 0; int rc = -1; int manageDSAit = get_manageDSAit( op ); +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *children = NULL; +#else + static const char *children = "children"; +#endif Debug(LDAP_DEBUG_ARGS, "==> ldbm_back_delete: %s\n", dn, 0, 0); @@ -117,7 +122,7 @@ ldbm_back_delete( /* check parent for "children" acl */ if ( ! access_allowed( be, conn, op, p, - "children", NULL, ACL_WRITE ) ) + children, NULL, ACL_WRITE ) ) { Debug( LDAP_DEBUG_TRACE, "<=- ldbm_back_delete: no access to parent\n", 0, diff --git a/servers/slapd/back-ldbm/external.h b/servers/slapd/back-ldbm/external.h index 6b1e8c7466..e58b4c57b7 100644 --- a/servers/slapd/back-ldbm/external.h +++ b/servers/slapd/back-ldbm/external.h @@ -76,7 +76,8 @@ extern int ldbm_back_abandon LDAP_P(( BackendDB *bd, #ifdef SLAPD_SCHEMA_NOT_COMPAT extern int ldbm_back_group LDAP_P(( BackendDB *bd, Entry *target, const char* gr_ndn, const char* op_ndn, - const char* objectclassValue, AttributeType* group_at)); + const char* objectclassValue, + AttributeDescription* group_at)); #else extern int ldbm_back_group LDAP_P(( BackendDB *bd, Entry *target, const char* gr_ndn, const char* op_ndn, diff --git a/servers/slapd/back-ldbm/group.c b/servers/slapd/back-ldbm/group.c index 7e4fdcabaa..e361f2a57c 100644 --- a/servers/slapd/back-ldbm/group.c +++ b/servers/slapd/back-ldbm/group.c @@ -29,21 +29,24 @@ ldbm_back_group( const char *op_ndn, const char *objectclassValue, #ifdef SLAPD_SCHEMA_NOT_COMPAT - AttributeType *group_at + AttributeDescription *group_at #else - const char *groupattrName + const char *group_at #endif ) { struct ldbminfo *li = (struct ldbminfo *) be->be_private; Entry *e; int rc = 1; - Attribute *attr; - struct berval bv; #ifdef SLAPD_SCHEMA_NOT_COMPAT - char *groupattrName = at_canonical_name( group_at ); + static AttributeDescription *objectClass = NULL; + const char *groupattrName = group_at->ad_cname->bv_val; +#else + struct berval bv; + const char *objectClass = "objectclass"; + const char *groupattrName = group_at; #endif Debug( LDAP_DEBUG_ARGS, @@ -88,16 +91,16 @@ ldbm_back_group( rc = 1; -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else - - if ((attr = attr_find(e->e_attrs, "objectclass")) == NULL) { + if ((attr = attr_find(e->e_attrs, objectClass)) == NULL) { Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: failed to find objectClass\n", 0, 0, 0 ); goto return_results; } +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not yet implemented */ +#else + bv.bv_val = "ALIAS"; bv.bv_len = sizeof("ALIAS")-1; @@ -127,7 +130,7 @@ ldbm_back_group( goto return_results; } - if ((attr = attr_find(e->e_attrs, groupattrName)) == NULL) { + if ((attr = attr_find(e->e_attrs, group_at)) == NULL) { Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: failed to find %s\n", groupattrName, 0, 0 ); @@ -148,13 +151,13 @@ ldbm_back_group( op_ndn, gr_ndn, groupattrName ); goto return_results; } +#endif Debug( LDAP_DEBUG_ACL, "<= ldbm_back_group: \"%s\" is in \"%s\": %s\n", op_ndn, gr_ndn, groupattrName ); rc = 0; -#endif return_results: if( target != e ) { diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c index 07c42cdf3c..e6f8d0ae09 100644 --- a/servers/slapd/back-ldbm/modify.c +++ b/servers/slapd/back-ldbm/modify.c @@ -17,6 +17,10 @@ #include "back-ldbm.h" #include "proto-back-ldbm.h" +static int add_values LDAP_P(( Entry *e, Modification *mod, char *dn )); +static int delete_values LDAP_P(( Entry *e, Modification *mod, char *dn )); +static int replace_values LDAP_P(( Entry *e, Modification *mod, char *dn )); + /* We need this function because of LDAP modrdn. If we do not * add this there would be a bunch of code replication here * and there and of course the likelihood of bugs increases. @@ -33,9 +37,8 @@ int ldbm_modify_internal( ) { int err; - LDAPMod *mod; + Modification *mod; Modifications *ml; - Attribute *a; Attribute *save_attrs; if ( !acl_check_modlist( be, conn, op, e, modlist )) { @@ -48,7 +51,12 @@ int ldbm_modify_internal( for ( ml = modlist; ml != NULL; ml = ml->ml_next ) { mod = &ml->ml_mod; - switch ( mod->mod_op ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + switch ( mod->sm_op ) +#else + switch ( mod->mod_op ) +#endif + { case LDAP_MOD_ADD: err = add_values( e, mod, op->o_ndn ); break; @@ -65,12 +73,19 @@ int ldbm_modify_internal( /* Avoid problems in index_add_mods() * We need to add index if necessary. */ +#ifdef SLAPD_SCHEMA_NOT_COMPAT + mod->sm_op = LDAP_MOD_ADD; +#else mod->mod_op = LDAP_MOD_ADD; - if ( (err = add_values( e, mod, op->o_ndn )) - == LDAP_TYPE_OR_VALUE_EXISTS ) { - +#endif + err = add_values( e, mod, op->o_ndn ); + if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) { err = LDAP_SUCCESS; - mod->mod_op = SLAP_MOD_SOFTADD; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + mod->sm_op = SLAP_MOD_SOFTADD; +#else + mod->mod_op = SLAP_MOD_SOFTADD; +#endif } break; @@ -116,9 +131,17 @@ int ldbm_modify_internal( if( save_attrs != NULL ) { for ( ml = modlist; ml != NULL; ml = ml->ml_next ) { mod = &ml->ml_mod; - if ( mod->mod_op == LDAP_MOD_REPLACE ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if ( mod->sm_op == LDAP_MOD_REPLACE ) +#else + if ( mod->mod_op == LDAP_MOD_REPLACE ) +#endif + { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not yet implemented */ +#else /* Need to remove all values from indexes */ - a = attr_find( save_attrs, mod->mod_type ); + Attribute *a = attr_find( save_attrs, mod->mod_type ); if( a != NULL ) { (void) index_change_values( be, @@ -127,6 +150,7 @@ int ldbm_modify_internal( e->e_id, SLAP_INDEX_DELETE_OP); } +#endif } } attrs_free( save_attrs ); @@ -233,27 +257,26 @@ error_return:; return( -1 ); } -int +static int add_values( Entry *e, - LDAPMod *mod, + Modification *mod, char *dn ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not yet implemented */ +#else int i; Attribute *a; /* check if the values we're adding already exist */ if ( (a = attr_find( e->e_attrs, mod->mod_type )) != NULL ) { for ( i = 0; mod->mod_bvalues[i] != NULL; i++ ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else if ( value_find( a->a_vals, mod->mod_bvalues[i], a->a_syntax, 3 ) == 0 ) { return( LDAP_TYPE_OR_VALUE_EXISTS ); } -#endif } } @@ -261,17 +284,21 @@ add_values( if( attr_merge( e, mod->mod_type, mod->mod_bvalues ) != 0 ) { return( LDAP_CONSTRAINT_VIOLATION ); } +#endif return( LDAP_SUCCESS ); } -int +static int delete_values( Entry *e, - LDAPMod *mod, + Modification *mod, char *dn ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not yet implemented */ +#else int i, j, k, found; Attribute *a; @@ -294,14 +321,10 @@ delete_values( for ( i = 0; mod->mod_bvalues[i] != NULL; i++ ) { found = 0; for ( j = 0; a->a_vals[j] != NULL; j++ ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else if ( value_cmp( mod->mod_bvalues[i], a->a_vals[j], a->a_syntax, 3 ) != 0 ) { continue; } -#endif found = 1; /* found a matching value - delete it */ @@ -332,17 +355,21 @@ delete_values( return( LDAP_NO_SUCH_ATTRIBUTE ); } } +#endif return( LDAP_SUCCESS ); } -int +static int replace_values( Entry *e, - LDAPMod *mod, + Modification *mod, char *dn ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* not yet implemented */ +#else (void) attr_delete( &e->e_attrs, mod->mod_type ); if ( mod->mod_bvalues != NULL && @@ -350,6 +377,7 @@ replace_values( { return( LDAP_CONSTRAINT_VIOLATION ); } +#endif return( LDAP_SUCCESS ); } diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c index 6ac0728c23..7c58eb0baf 100644 --- a/servers/slapd/back-ldbm/modrdn.c +++ b/servers/slapd/back-ldbm/modrdn.c @@ -44,6 +44,11 @@ ldbm_back_modrdn( char *newSuperior ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *children = NULL; +#else + static const char *children = "children"; +#endif struct ldbminfo *li = (struct ldbminfo *) be->be_private; char *p_dn = NULL, *p_ndn = NULL; char *new_dn = NULL, *new_ndn = NULL; @@ -145,7 +150,7 @@ ldbm_back_modrdn( /* check parent for "children" acl */ if ( ! access_allowed( be, conn, op, p, - "children", NULL, ACL_WRITE ) ) + children, NULL, ACL_WRITE ) ) { Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0, 0, 0 ); @@ -211,7 +216,7 @@ ldbm_back_modrdn( np, np->e_id, 0 ); /* check newSuperior for "children" acl */ - if ( !access_allowed( be, conn, op, np, "children", NULL, + if ( !access_allowed( be, conn, op, np, children, NULL, ACL_WRITE ) ) { Debug( LDAP_DEBUG_TRACE, diff --git a/servers/slapd/back-ldbm/passwd.c b/servers/slapd/back-ldbm/passwd.c index e5a6dbfe36..cc80f7274b 100644 --- a/servers/slapd/back-ldbm/passwd.c +++ b/servers/slapd/back-ldbm/passwd.c @@ -40,6 +40,12 @@ ldbm_back_exop_passwd( char *dn; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *entry = NULL; +#else + static const char *entry = "entry"; +#endif + assert( reqoid != NULL ); assert( strcmp( LDAP_EXOP_X_MODIFY_PASSWD, reqoid ) == 0 ); @@ -92,7 +98,7 @@ ldbm_back_exop_passwd( goto done; } - if( ! access_allowed( be, conn, op, e, "entry", NULL, ACL_WRITE ) ) { + if( ! access_allowed( be, conn, op, e, entry, NULL, ACL_WRITE ) ) { *text = ch_strdup("access to authorization entry denied"); rc = LDAP_INSUFFICIENT_ACCESS; goto done; diff --git a/servers/slapd/back-ldbm/proto-back-ldbm.h b/servers/slapd/back-ldbm/proto-back-ldbm.h index 5159732a49..290a992275 100644 --- a/servers/slapd/back-ldbm/proto-back-ldbm.h +++ b/servers/slapd/back-ldbm/proto-back-ldbm.h @@ -168,10 +168,6 @@ extern int ldbm_back_exop_passwd LDAP_P(( BackendDB *bd, * */ -int add_values LDAP_P(( Entry *e, LDAPMod *mod, char *dn )); -int delete_values LDAP_P(( Entry *e, LDAPMod *mod, char *dn )); -int replace_values LDAP_P(( Entry *e, LDAPMod *mod, char *dn )); - /* returns LDAP error code indicating error OR SLAPD_ABANDON */ int ldbm_modify_internal LDAP_P((Backend *be, Connection *conn, Operation *op, diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c index 3731b92a6c..60b4fa010d 100644 --- a/servers/slapd/back-ldbm/search.c +++ b/servers/slapd/back-ldbm/search.c @@ -282,8 +282,9 @@ ldbm_back_search( } if (e) { - /* Tack on subordinates attr */ int result; +#ifdef BROKEN_NUM_SUBORDINATES + /* Tack on subordinates attr */ ID_BLOCK *idl = NULL; char CATTR_SUBS[] = "numsubordinates"; @@ -311,6 +312,7 @@ ldbm_back_search( vals); } } +#endif result = send_search_entry(be, conn, @@ -319,12 +321,15 @@ ldbm_back_search( attrs, attrsonly, NULL); + +#ifdef BROKEN_NUM_SUBORDINATES if (idl) { idl_free(idl); attr_delete(&e->e_attrs, CATTR_SUBS); } +#endif switch (result) { @@ -400,104 +405,97 @@ search_candidates( ) { ID_BLOCK *candidates; - Filter *f, *rf, *af, *lf; + Filter rf, rf_or, af, af_or, lf, lf_and; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + struct berval rf_or_bv, af_or_bv; + static AttributeDescription *objectClass = NULL; +#endif Debug(LDAP_DEBUG_TRACE, "search_candidates: base=\"%s\" s=%d d=%d\n", e->e_ndn, scope, deref ); - f = NULL; - if( !manageDSAit ) { /* match referrals */ - rf = (Filter *) ch_malloc( sizeof(Filter) ); - rf->f_next = NULL; - rf->f_choice = LDAP_FILTER_OR; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - rf->f_or = (Filter *) ch_malloc( sizeof(Filter) ); - rf->f_or->f_choice = LDAP_FILTER_EQUALITY; - rf->f_or->f_avtype = ch_strdup( "objectclass" ); - rf->f_or->f_avvalue.bv_val = ch_strdup( "REFERRAL" ); - rf->f_or->f_avvalue.bv_len = sizeof("REFERRAL")-1; - rf->f_or->f_next = filter; + rf.f_next = NULL; + rf.f_choice = LDAP_FILTER_OR; + rf.f_or = &rf_or; + rf.f_or->f_choice = LDAP_FILTER_EQUALITY; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + rf.f_or->f_av_desc = objectClass; + rf.f_or->f_av_value = &rf_or_bv; + rf.f_or->f_av_value->bv_val = ch_strdup( "REFERRAL" ); + rf.f_or->f_av_value->bv_len = sizeof("REFERRAL")-1; +#else + rf.f_or->f_avtype = ch_strdup( "objectclass" ); + rf.f_or->f_avvalue.bv_val = ch_strdup( "REFERRAL" ); + rf.f_or->f_avvalue.bv_len = sizeof("REFERRAL")-1; #endif - f = rf; + rf.f_or->f_next = filter; + filter = &rf; } else { - rf = NULL; - f = filter; + rf.f_or = NULL; } if( deref & LDAP_DEREF_SEARCHING ) { /* match aliases */ - af = (Filter *) ch_malloc( sizeof(Filter) ); - af->f_next = NULL; - af->f_choice = LDAP_FILTER_OR; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - af->f_or = (Filter *) ch_malloc( sizeof(Filter) ); - af->f_or->f_choice = LDAP_FILTER_EQUALITY; - af->f_or->f_avtype = ch_strdup( "objectclass" ); - af->f_or->f_avvalue.bv_val = ch_strdup( "ALIAS" ); - af->f_or->f_avvalue.bv_len = sizeof("ALIAS")-1; - af->f_or->f_next = f; + af.f_next = NULL; + af.f_choice = LDAP_FILTER_OR; + af.f_or = &af_or; + af.f_or->f_choice = LDAP_FILTER_EQUALITY; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + af.f_or->f_av_desc = objectClass; + af.f_or->f_av_value = &af_or_bv; + af.f_or->f_av_value->bv_val = ch_strdup( "ALIAS" ); + af.f_or->f_av_value->bv_len = sizeof("ALIAS")-1; +#else + af.f_or->f_avtype = ch_strdup( "objectclass" ); + af.f_or->f_avvalue.bv_val = ch_strdup( "ALIAS" ); + af.f_or->f_avvalue.bv_len = sizeof("ALIAS")-1; #endif - f = af; + af.f_or->f_next = filter; + filter = ⁡ } else { - af = NULL; + af.f_or = NULL; } if ( scope == LDAP_SCOPE_SUBTREE ) { - lf = (Filter *) ch_malloc( sizeof(Filter) ); - lf->f_next = NULL; - lf->f_choice = LDAP_FILTER_AND; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - lf->f_and = (Filter *) ch_malloc( sizeof(Filter) ); - - lf->f_and->f_choice = SLAPD_FILTER_DN_SUBTREE; - lf->f_and->f_dn = e->e_ndn; - - lf->f_and->f_next = f; -#endif - f = lf; + lf.f_next = NULL; + lf.f_choice = LDAP_FILTER_AND; + lf.f_and = &lf_and; + lf.f_and->f_choice = SLAPD_FILTER_DN_SUBTREE; + lf.f_and->f_dn = e->e_ndn; + lf.f_and->f_next = filter; + filter = &lf; } else if ( scope == LDAP_SCOPE_ONELEVEL ) { - lf = (Filter *) ch_malloc( sizeof(Filter) ); - lf->f_next = NULL; - lf->f_choice = LDAP_FILTER_AND; -#ifndef SLAPD_SCHEMA_NOT_COMPAT - lf->f_and = (Filter *) ch_malloc( sizeof(Filter) ); - - lf->f_and->f_choice = SLAPD_FILTER_DN_ONE; - lf->f_and->f_dn = e->e_ndn; - - lf->f_and->f_next = f; -#endif - f = lf; - - } else { - lf = NULL; + lf.f_next = NULL; + lf.f_choice = LDAP_FILTER_AND; + lf.f_and = &lf_and; + lf.f_and->f_choice = SLAPD_FILTER_DN_ONE; + lf.f_and->f_dn = e->e_ndn; + lf.f_and->f_next = filter; + filter = &lf; } - candidates = filter_candidates( be, f ); - - /* free up filter additions we allocated above */ - if( lf != NULL ) { -#ifndef SLAPD_SCHEMA_NOT_COMPAT - free( lf->f_and ); -#endif - free( lf ); - } + candidates = filter_candidates( be, filter ); - if( af != NULL ) { -#ifndef SLAPD_SCHEMA_NOT_COMPAT - af->f_or->f_next = NULL; + /* free dynamically allocated bits */ + if( af.f_or != NULL ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + free( af.f_or->f_av_value->bv_val ); +#else + free( af.f_or->f_avtype ); + free( af.f_or->f_avvalue.bv_val ); #endif - filter_free( af ); } - if( rf != NULL ) { -#ifndef SLAPD_SCHEMA_NOT_COMPAT - rf->f_or->f_next = NULL; + if( rf.f_or != NULL ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + free( rf.f_or->f_av_value->bv_val ); +#else + free( rf.f_or->f_avtype ); + free( rf.f_or->f_avvalue.bv_val ); #endif - filter_free( rf ); } return( candidates ); diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c index 8dd65ff26e..0fc7d6ceec 100644 --- a/servers/slapd/backend.c +++ b/servers/slapd/backend.c @@ -648,7 +648,7 @@ Attribute *backend_operational( /* Should be backend specific */ a->a_vals = ch_malloc( 2 * sizeof( struct berval * ) ); a->a_vals[0] = ch_malloc( sizeof( struct berval ) ); - a->a_vals[0]->bv_val = strdup( SLAPD_SCHEMA_DN ); + a->a_vals[0]->bv_val = ch_strdup( SLAPD_SCHEMA_DN ); a->a_vals[0]->bv_len = sizeof( SLAPD_SCHEMA_DN ) - 1; a->a_vals[1] = NULL; diff --git a/servers/slapd/config.c b/servers/slapd/config.c index f025c541ef..beb3ae04e2 100644 --- a/servers/slapd/config.c +++ b/servers/slapd/config.c @@ -485,7 +485,7 @@ read_config( const char *fname ) "%s: line %d: old attribute type format not supported.\n", fname, lineno, 0 ); #else - attr_syntax_config( fname, lineno, cargc - 1, + at_config( fname, lineno, cargc - 1, &cargv[1] ); #endif } diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c index 0b85141b88..bf6ab949cd 100644 --- a/servers/slapd/dn.c +++ b/servers/slapd/dn.c @@ -45,13 +45,13 @@ dn_validate( char *dn ) switch ( state ) { case B4LEADTYPE: case B4TYPE: - if ( LEADOIDCHAR(*s) ) { + if ( OID_LEADCHAR(*s) ) { state = INOIDTYPE; *d++ = *s; - } else if ( LEADKEYCHAR(*s) ) { + } else if ( ATTR_LEADCHAR(*s) ) { state = INKEYTYPE; *d++ = *s; - } else if ( ! SPACE( *s ) ) { + } else if ( ! ASCII_SPACE( *s ) ) { dn = NULL; state = INKEYTYPE; *d++ = *s; @@ -59,12 +59,12 @@ dn_validate( char *dn ) break; case INOIDTYPE: - if ( OIDCHAR(*s) ) { + if ( OID_CHAR(*s) ) { *d++ = *s; } else if ( *s == '=' ) { state = B4VALUE; *d++ = *s; - } else if ( SPACE( *s ) ) { + } else if ( ASCII_SPACE( *s ) ) { state = B4EQUAL; } else { dn = NULL; @@ -73,12 +73,12 @@ dn_validate( char *dn ) break; case INKEYTYPE: - if ( KEYCHAR(*s) ) { + if ( ATTR_CHAR(*s) ) { *d++ = *s; } else if ( *s == '=' ) { state = B4VALUE; *d++ = *s; - } else if ( SPACE( *s ) ) { + } else if ( ASCII_SPACE( *s ) ) { state = B4EQUAL; } else { dn = NULL; @@ -90,7 +90,7 @@ dn_validate( char *dn ) if ( *s == '=' ) { state = B4VALUE; *d++ = *s; - } else if ( ! SPACE( *s ) ) { + } else if ( ! ASCII_SPACE( *s ) ) { /* not a valid dn - but what can we do here? */ *d++ = *s; dn = NULL; @@ -101,15 +101,15 @@ dn_validate( char *dn ) if ( *s == '"' ) { state = INQUOTEDVALUE; *d++ = *s; - } else if ( ! SPACE( *s ) ) { + } else if ( ! ASCII_SPACE( *s ) ) { state = INVALUE; *d++ = *s; } break; case INVALUE: - if ( !gotesc && SEPARATOR( *s ) ) { - while ( SPACE( *(d - 1) ) ) + if ( !gotesc && RDN_SEPARATOR( *s ) ) { + while ( ASCII_SPACE( *(d - 1) ) ) d--; state = B4TYPE; if ( *s == '+' ) { @@ -117,8 +117,8 @@ dn_validate( char *dn ) } else { *d++ = ','; } - } else if ( gotesc && !NEEDSESCAPE( *s ) && - !SEPARATOR( *s ) ) { + } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) && + !RDN_SEPARATOR( *s ) ) { *--d = *s; d++; } else { @@ -130,7 +130,7 @@ dn_validate( char *dn ) if ( !gotesc && *s == '"' ) { state = B4SEPARATOR; *d++ = *s; - } else if ( gotesc && !NEEDSESCAPE( *s ) ) { + } else if ( gotesc && !RDN_NEEDSESCAPE( *s ) ) { *--d = *s; d++; } else { @@ -138,7 +138,7 @@ dn_validate( char *dn ) } break; case B4SEPARATOR: - if ( SEPARATOR( *s ) ) { + if ( RDN_SEPARATOR( *s ) ) { state = B4TYPE; *d++ = *s; } @@ -210,7 +210,7 @@ dn_parent( return NULL; } - while(*dn && SPACE(*dn)) { + while(*dn != '\0' && ASCII_SPACE(*dn)) { dn++; } @@ -223,7 +223,7 @@ dn_parent( } /* - * else assume it is an X.500-style name, which looks like + * assume it is an X.500-style name, which looks like * foo=bar,sha=baz,... */ @@ -242,7 +242,7 @@ dn_parent( } else { if ( *s == '"' ) { inquote = 1; - } else if ( DNSEPARATOR( *s ) ) { + } else if ( DN_SEPARATOR( *s ) ) { return( ch_strdup( &s[1] ) ); } } @@ -262,7 +262,7 @@ char * dn_rdn( return NULL; } - while(*dn && SPACE(*dn)) { + while(*dn && ASCII_SPACE(*dn)) { dn++; } @@ -292,7 +292,7 @@ char * dn_rdn( } else { if ( *s == '"' ) { inquote = 1; - } else if ( DNSEPARATOR( *s ) ) { + } else if ( DN_SEPARATOR( *s ) ) { *s = '\0'; return( dn ); } @@ -387,7 +387,7 @@ get_next_substring( char * s, char d ) /* Skip leading spaces */ - while ( *s && SPACE(*s) ) { + while ( *s && ASCII_SPACE(*s) ) { s++; diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c index a709bb7e62..8d225049f0 100644 --- a/servers/slapd/filter.c +++ b/servers/slapd/filter.c @@ -290,10 +290,9 @@ get_substring_filter( #else /* we should call a substring syntax normalization routine */ value_normalize( val->bv_val, syntax ); -#endif - /* this is bogus, value_normalize should take a berval */ val->bv_len = strlen( val->bv_val ); +#endif switch ( tag ) { case LDAP_SUBSTRING_INITIAL: @@ -313,7 +312,10 @@ get_substring_filter( case LDAP_SUBSTRING_ANY: Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 ); - charray_add( (char ***) &f->f_sub_any, (char *) val ); + if( ber_bvecadd( &f->f_sub_any, val ) < 0 ) { + ber_bvfree( val ); + goto return_error; + } if( fstr ) { *fstr = ch_realloc( *fstr, diff --git a/servers/slapd/filterentry.c b/servers/slapd/filterentry.c index aa96c940da..875c8572ed 100644 --- a/servers/slapd/filterentry.c +++ b/servers/slapd/filterentry.c @@ -199,7 +199,6 @@ test_ava_filter( if ( be != NULL && ! access_allowed( be, conn, op, e, ava->aa_desc->ad_type->sat_cname, ava->aa_value, ACL_SEARCH ) ) #else - int rc; if ( be != NULL && ! access_allowed( be, conn, op, e, ava->ava_type, &ava->ava_value, ACL_SEARCH ) ) @@ -227,12 +226,23 @@ test_ava_filter( for ( i = 0; a->a_vals[i] != NULL; i++ ) { #ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ - int rc; + int rc = -1; + + switch ( type ) { + case LDAP_FILTER_EQUALITY: + break; + case LDAP_FILTER_APPROX: + break; + + case LDAP_FILTER_GE: + case LDAP_FILTER_LE: + break; + } + + if( rc == LDAP_COMPARE_TRUE ) return LDAP_COMPARE_TRUE; #else int rc = value_cmp( a->a_vals[i], &ava->ava_value, a->a_syntax, 3 ); -#endif switch ( type ) { case LDAP_FILTER_EQUALITY: @@ -254,6 +264,7 @@ test_ava_filter( } break; } +#endif } return( LDAP_COMPARE_FALSE ); @@ -472,9 +483,7 @@ test_substring_filter( Filter *f ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ -#else +#ifndef SLAPD_SCHEMA_NOT_COMPAT Attribute *a; int i, rc; char *p, *end, *realval, *tmp; diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c index 8dbfb96c78..502797eb80 100644 --- a/servers/slapd/mr.c +++ b/servers/slapd/mr.c @@ -110,6 +110,7 @@ mr_insert( int mr_add( LDAP_MATCHING_RULE *mr, + unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, slap_mr_match_func *match, @@ -125,6 +126,7 @@ mr_add( smr = (MatchingRule *) ch_calloc( 1, sizeof(MatchingRule) ); memcpy( &smr->smr_mrule, mr, sizeof(LDAP_MATCHING_RULE)); + smr->smr_usage = usage; smr->smr_convert = convert; smr->smr_normalize = normalize; smr->smr_match = match; @@ -150,6 +152,7 @@ mr_add( int register_matching_rule( char * desc, + unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, slap_mr_match_func *match, @@ -160,6 +163,12 @@ register_matching_rule( int code; const char *err; + if( usage == SLAP_MR_NONE ) { + Debug( LDAP_DEBUG_ANY, "register_matching_rule: not usable %s\n", + desc, 0, 0 ); + return -1; + } + mr = ldap_str2matchingrule( desc, &code, &err); if ( !mr ) { Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n", @@ -167,7 +176,7 @@ register_matching_rule( return( -1 ); } - code = mr_add( mr, convert, normalize, match, indexer, filter, &err ); + code = mr_add( mr, usage, convert, normalize, match, indexer, filter, &err ); if ( code ) { Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s for %s in %s\n", scherr2str(code), err, desc ); diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c index 88e180983f..0f978b1a4a 100644 --- a/servers/slapd/oc.c +++ b/servers/slapd/oc.c @@ -22,6 +22,11 @@ int is_entry_objectclass( { Attribute *attr; struct berval bv; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *objectClass = NULL; +#else + static const char *objectClass = "objectclass"; +#endif if( e == NULL || oc == NULL || *oc == '\0' ) return 0; @@ -29,7 +34,7 @@ int is_entry_objectclass( /* * find objectClass attribute */ - attr = attr_find(e->e_attrs, "objectclass"); + attr = attr_find(e->e_attrs, objectClass); if( attr == NULL ) { /* no objectClass attribute */ diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index c83716784c..0e2973cb3c 100644 --- a/servers/slapd/proto-slap.h +++ b/servers/slapd/proto-slap.h @@ -11,6 +11,11 @@ LDAP_BEGIN_DECL #ifdef SLAPD_SCHEMA_NOT_COMPAT +LIBSLAPD_F (int) slap_str2ad LDAP_P(( + const char *, + AttributeDescription **ad, + char **text )); + LIBSLAPD_F (int) slap_bv2ad LDAP_P(( struct berval *bv, AttributeDescription **ad, @@ -19,21 +24,32 @@ LIBSLAPD_F (int) slap_bv2ad LDAP_P(( LIBSLAPD_F (void) ad_free LDAP_P(( AttributeDescription *desc, int freeit )); + +LIBSLAPD_F (int) ad_inlist LDAP_P(( + AttributeDescription *desc, + char **attrs )); +#else +#define ad_inlist(d,a) charray_inlist(a,d) #endif /* * acl.c */ -LIBSLAPD_F (int) access_allowed LDAP_P(( Backend *be, Connection *conn, - Operation *op, Entry *e, - char *attr, struct berval *val, slap_access_t access )); - -LIBSLAPD_F (int) acl_check_modlist LDAP_P(( Backend *be, - Connection *conn, - Operation *op, - Entry *e, - Modifications *ml )); +#if SLAPD_SCHEMA_NOT_COMPAT +LIBSLAPD_F (int) access_allowed LDAP_P(( + Backend *be, Connection *conn, Operation *op, + Entry *e, AttributeDescription *type, struct berval *val, + slap_access_t access )); +#else +LIBSLAPD_F (int) access_allowed LDAP_P(( + Backend *be, Connection *conn, Operation *op, + Entry *e, const char *attr, struct berval *val, + slap_access_t access )); +#endif +LIBSLAPD_F (int) acl_check_modlist LDAP_P(( + Backend *be, Connection *conn, Operation *op, + Entry *e, Modifications *ml )); LIBSLAPD_F (void) acl_append( AccessControl **l, AccessControl *a ); @@ -44,8 +60,7 @@ LIBSLAPD_F (char *) get_supported_acimech LDAP_P((int index)); */ LIBSLAPD_F (void) parse_acl LDAP_P(( Backend *be, - const char *fname, - int lineno, + const char *fname, int lineno, int argc, char **argv )); LIBSLAPD_F (char *) access2str LDAP_P(( slap_access_t access )); @@ -68,11 +83,17 @@ LIBSLAPD_F (int) attr_merge_fast LDAP_P(( Entry *e, const char *type, LIBSLAPD_F (int) attr_merge LDAP_P(( Entry *e, const char *type, struct berval **vals )); +#ifdef SLAPD_SCHEMA_NOT_COMPAT +LIBSLAPD_F (Attribute *) attr_find LDAP_P(( Attribute *a, AttributeDescription *desc )); +LIBSLAPD_F (int) attr_delete LDAP_P(( Attribute **attrs, AttributeDescription *desc )); +#else LIBSLAPD_F (Attribute *) attr_find LDAP_P(( Attribute *a, const char *type )); LIBSLAPD_F (int) attr_delete LDAP_P(( Attribute **attrs, const char *type )); LIBSLAPD_F (int) attr_syntax LDAP_P(( const char *type )); +#endif + -LIBSLAPD_F (void) attr_syntax_config LDAP_P(( const char *fname, int lineno, int argc, char **argv )); +LIBSLAPD_F (void) at_config LDAP_P(( const char *fname, int lineno, int argc, char **argv )); LIBSLAPD_F (AttributeType *) at_find LDAP_P(( const char *name )); LIBSLAPD_F (int) at_find_in_list LDAP_P(( AttributeType *sat, AttributeType **list )); LIBSLAPD_F (int) at_append_to_list LDAP_P(( AttributeType *sat, AttributeType ***listp )); @@ -146,7 +167,7 @@ LIBSLAPD_F (int) backend_group LDAP_P((Backend *be, const char *gr_ndn, const char *op_ndn, const char *objectclassValue, - AttributeType *groupAttrType + AttributeDescription *groupAttrType )); #else LIBSLAPD_F (int) backend_group LDAP_P((Backend *be, @@ -502,6 +523,7 @@ LIBSLAPD_F (int) syn_add LDAP_P((LDAP_SYNTAX *syn, int flags, LIBSLAPD_F (MatchingRule *) mr_find LDAP_P((const char *mrname)); LIBSLAPD_F (int) mr_add LDAP_P((LDAP_MATCHING_RULE *mr, + unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, slap_mr_match_func *match, @@ -515,6 +537,7 @@ LIBSLAPD_F (int) register_syntax LDAP_P((char *desc, int flags, slap_syntax_transform_func *str2ber )); LIBSLAPD_F (int) register_matching_rule LDAP_P((char * desc, + unsigned usage, slap_mr_convert_func *convert, slap_mr_normalize_func *normalize, slap_mr_match_func *match, @@ -573,7 +596,7 @@ LIBSLAPD_F (int) starttls_extop LDAP_P(( * str2filter.c */ -LIBSLAPD_F (Filter *) str2filter LDAP_P(( char *str )); +LIBSLAPD_F (Filter *) str2filter LDAP_P(( const char *str )); /* * suffixalias.c diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 2dc83b3689..b76c128805 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -128,7 +128,13 @@ struct berval **get_entry_referrals( struct berval **refs; unsigned i, j; - attr = attr_find( e->e_attrs, "ref" ); +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *ref = NULL; +#else + static const char *ref = "ref"; +#endif + + attr = attr_find( e->e_attrs, ref ); if( attr == NULL ) return NULL; @@ -622,10 +628,16 @@ send_search_entry( int userattrs; int opattrs; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *entry = NULL; +#else + static const char *entry = "entry"; +#endif + Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: \"%s\"\n", e->e_dn, 0, 0 ); if ( ! access_allowed( be, conn, op, e, - "entry", NULL, ACL_READ ) ) + entry, NULL, ACL_READ ) ) { Debug( LDAP_DEBUG_ACL, "acl: access to entry not allowed\n", 0, 0, 0 ); @@ -663,28 +675,36 @@ send_search_entry( : charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES ); for ( a = e->e_attrs; a != NULL; a = a->a_next ) { - char *desc; #ifdef SLAPD_SCHEMA_NOT_COMPAT - desc = a->a_desc.ad_type->sat_cname; + AttributeDescription *desc = &a->a_desc; #else - desc = a->a_type; + char *desc = a->a_type; #endif if ( attrs == NULL ) { /* all addrs request, skip operational attributes */ - if( !opattrs && oc_check_op_attr( desc ) ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if( is_at_operational( desc->ad_type ) ) +#else + if( oc_check_op_attr( desc ) ) +#endif + { continue; } } else { /* specific addrs requested */ +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if ( is_at_operational( desc->ad_type ) ) +#else if ( oc_check_op_attr( desc ) ) +#endif { - if( !opattrs && !charray_inlist( attrs, desc ) ) { + if( !opattrs && !ad_inlist( desc, attrs ) ) { continue; } } else { - if (!userattrs && !charray_inlist( attrs, desc ) ) { + if (!userattrs && !ad_inlist( desc, attrs ) ) { continue; } } @@ -740,28 +760,37 @@ send_search_entry( aa = backend_operational( be, e ); for (a = aa ; a == NULL; a = a->a_next ) { - char *desc; #ifdef SLAPD_SCHEMA_NOT_COMPAT - desc = a->a_desc.ad_type->sat_cname; + AttributeDescription *desc = &a->a_desc; #else - desc = a->a_type; + char *desc = a->a_type; #endif if ( attrs == NULL ) { /* all addrs request, skip operational attributes */ - if( !opattrs && oc_check_op_attr( desc ) ) { +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if( is_at_operational( desc->ad_type ) ) +#else + if( oc_check_op_attr( desc ) ) +#endif + { continue; } } else { /* specific addrs requested */ - if ( oc_check_op_attr( desc ) ) { - if( !opattrs && !charray_inlist( attrs, desc ) ) +#ifdef SLAPD_SCHEMA_NOT_COMPAT + if( is_at_operational( desc->ad_type ) ) +#else + if( oc_check_op_attr( desc ) ) +#endif + { + if( !opattrs && !ad_inlist( desc, attrs ) ) { continue; } } else { - if (!userattrs && !charray_inlist( attrs, desc ) ) + if (!userattrs && !ad_inlist( desc, attrs ) ) { continue; } @@ -869,10 +898,18 @@ send_search_reference( int rc; int bytes; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *ref = NULL; + static AttributeDescription *entry = NULL; +#else + static const char *ref = "ref"; + static const char *entry = "entry"; +#endif + Debug( LDAP_DEBUG_TRACE, "=> send_search_reference (%s)\n", e->e_dn, 0, 0 ); if ( ! access_allowed( be, conn, op, e, - "entry", NULL, ACL_READ ) ) + entry, NULL, ACL_READ ) ) { Debug( LDAP_DEBUG_ACL, "send_search_reference: access to entry not allowed\n", @@ -881,7 +918,7 @@ send_search_reference( } if ( ! access_allowed( be, conn, op, e, - "ref", NULL, ACL_READ ) ) + ref, NULL, ACL_READ ) ) { Debug( LDAP_DEBUG_ACL, "send_search_reference: access to reference not allowed\n", diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c index 5d688c936d..6896cb9377 100644 --- a/servers/slapd/root_dse.c +++ b/servers/slapd/root_dse.c @@ -45,6 +45,9 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly ) } } +#ifdef SLAPD_SCHEMA_NOT_COMPAT + /* we shouldn't publish subentries as naming contexts */ +#else #if defined( SLAPD_MONITOR_DN ) val.bv_val = SLAPD_MONITOR_DN; val.bv_len = strlen( val.bv_val ); @@ -62,6 +65,7 @@ root_dse_info( Connection *conn, Operation *op, char **attrs, int attrsonly ) val.bv_val = SLAPD_SCHEMA_DN; val.bv_len = strlen( val.bv_val ); attr_merge( e, "namingContexts", vals ); +#endif #endif /* altServer unsupported */ diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c index 433cabae19..cd328eed6a 100644 --- a/servers/slapd/schema_check.c +++ b/servers/slapd/schema_check.c @@ -39,11 +39,17 @@ schema_check_entry( Entry *e ) ObjectClass *oc; int i; int ret = 0; +#ifdef SLAPD_SCHEMA_NOT_COMPAT + static AttributeDescription *objectClass = NULL; +#else + static const char *objectClass = "objectclass"; +#endif + if( !global_schemacheck ) return 0; /* find the object class attribute - could error out here */ - if ( (aoc = attr_find( e->e_attrs, "objectclass" )) == NULL ) { + if ( (aoc = attr_find( e->e_attrs, objectClass )) == NULL ) { Debug( LDAP_DEBUG_ANY, "No object class for entry (%s)\n", e->e_dn, 0, 0 ); return( 1 ); diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index f5c7e686ff..a7da31ac3e 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -53,6 +53,7 @@ UTF8StringValidate( static int UTF8StringNormalize( + int use, Syntax *syntax, MatchingRule *mr, struct berval *val, @@ -129,7 +130,7 @@ UTF8StringNormalize( return 0; } -int +static int IA5StringValidate( Syntax *syntax, struct berval *val ) @@ -168,6 +169,7 @@ IA5StringConvert( static int IA5StringNormalize( + int use, Syntax *syntax, MatchingRule *mr, struct berval *val, @@ -237,22 +239,26 @@ IA5StringNormalize( static int caseExactIA5Match( + int use, Syntax *syntax, MatchingRule *mr, struct berval *value, - struct berval *assertedValue ) + void *assertedValue ) { - return strcmp( value->bv_val, assertedValue->bv_val ); + return strcmp( value->bv_val, + ((struct berval *) assertedValue)->bv_val ); } static int caseIgnoreIA5Match( + int use, Syntax *syntax, MatchingRule *mr, struct berval *value, - struct berval *assertedValue ) + void *assertedValue ) { - return strcasecmp( value->bv_val, assertedValue->bv_val ); + return strcasecmp( value->bv_val, + ((struct berval *) assertedValue)->bv_val ); } struct syntax_defs_rec { @@ -360,6 +366,7 @@ struct syntax_defs_rec syntax_defs[] = { struct mrule_defs_rec { char * mrd_desc; + unsigned mrd_usage; slap_mr_convert_func * mrd_convert; slap_mr_normalize_func * mrd_normalize; slap_mr_match_func * mrd_match; @@ -425,110 +432,136 @@ struct mrule_defs_rec { struct mrule_defs_rec mrule_defs[] = { {"( 2.5.13.0 NAME 'objectIdentifierMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, objectIdentifierMatch, NULL, NULL}, {"( 2.5.13.1 NAME 'distinguishedNameMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, distinguishedNameMatch, NULL, NULL}, {"( 2.5.13.2 NAME 'caseIgnoreMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, UTF8StringNormalize, caseIgnoreMatch, NULL, NULL}, {"( 2.5.13.3 NAME 'caseIgnoreOrderingMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )", + SLAP_MR_ORDERING, NULL, UTF8StringNormalize, caseIgnoreOrderingMatch, NULL, NULL}, {"( 2.5.13.4 NAME 'caseIgnoreSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", + SLAP_MR_SUBSTR | SLAP_MR_EXT, NULL, UTF8StringNormalize, caseIgnoreSubstringsMatch, NULL, NULL}, /* Next three are not in the RFC's, but are needed for compatibility */ {"( 2.5.13.5 NAME 'caseExactMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, UTF8StringNormalize, caseExactMatch, NULL, NULL}, {"( 2.5.13.6 NAME 'caseExactOrderingMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )", + SLAP_MR_ORDERING, NULL, UTF8StringNormalize, caseExactOrderingMatch, NULL, NULL}, {"( 2.5.13.7 NAME 'caseExactSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", + SLAP_MR_SUBSTR | SLAP_MR_EXT, NULL, UTF8StringNormalize, caseExactSubstringsMatch, NULL, NULL}, {"( 2.5.13.8 NAME 'numericStringMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.36 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, numericStringMatch, NULL, NULL}, {"( 2.5.13.10 NAME 'numericStringSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", + SLAP_MR_SUBSTR | SLAP_MR_EXT, NULL, NULL, numericStringSubstringsMatch, NULL, NULL}, {"( 2.5.13.11 NAME 'caseIgnoreListMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.41 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, caseIgnoreListMatch, NULL, NULL}, {"( 2.5.13.14 NAME 'integerMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )", + SLAP_MR_NONE | SLAP_MR_EXT, NULL, NULL, integerMatch, NULL, NULL}, {"( 2.5.13.16 NAME 'bitStringMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.6 )", + SLAP_MR_NONE | SLAP_MR_EXT, NULL, NULL, bitStringMatch, NULL, NULL}, {"( 2.5.13.17 NAME 'octetStringMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, octetStringMatch, NULL, NULL}, {"( 2.5.13.20 NAME 'telephoneNumberMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.50 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, telephoneNumberMatch, NULL, NULL}, {"( 2.5.13.21 NAME 'telephoneNumberSubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.58 )", + SLAP_MR_SUBSTR | SLAP_MR_EXT, NULL, NULL, telephoneNumberSubstringsMatch, NULL, NULL}, {"( 2.5.13.22 NAME 'presentationAddressMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.43 )", + SLAP_MR_NONE | SLAP_MR_EXT, NULL, NULL, presentationAddressMatch, NULL, NULL}, {"( 2.5.13.23 NAME 'uniqueMemberMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.34 )", + SLAP_MR_NONE | SLAP_MR_EXT, NULL, NULL, uniqueMemberMatch, NULL, NULL}, {"( 2.5.13.24 NAME 'protocolInformationMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.42 )", + SLAP_MR_NONE | SLAP_MR_EXT, NULL, NULL, protocolInformationMatch, NULL, NULL}, {"( 2.5.13.27 NAME 'generalizedTimeMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, generalizedTimeMatch, NULL, NULL}, {"( 2.5.13.28 NAME 'generalizedTimeOrderingMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.24 )", + SLAP_MR_ORDERING, NULL, NULL, generalizedTimeOrderingMatch, NULL, NULL}, {"( 2.5.13.29 NAME 'integerFirstComponentMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, integerFirstComponentMatch, NULL, NULL}, {"( 2.5.13.30 NAME 'objectIdentifierFirstComponentMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.38 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, NULL, objectIdentifierFirstComponentMatch, NULL, NULL}, {"( 1.3.6.1.4.1.1466.109.114.1 NAME 'caseExactIA5Match' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, IA5StringNormalize, caseExactIA5Match, NULL, NULL}, {"( 1.3.6.1.4.1.1466.109.114.2 NAME 'caseIgnoreIA5Match' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )", + SLAP_MR_EQUALITY | SLAP_MR_EXT, NULL, IA5StringNormalize, caseIgnoreIA5Match, NULL, NULL}, {"( 1.3.6.1.4.1.1466.109.114.3 NAME 'caseIgnoreIA5SubstringsMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )", + SLAP_MR_SUBSTR, NULL, IA5StringNormalize, caseIgnoreIA5SubstringsMatch, NULL, NULL}, - {NULL, NULL, NULL, NULL} + {NULL, SLAP_MR_NONE, NULL, NULL, NULL} }; int @@ -557,8 +590,16 @@ schema_init( void ) } for ( i=0; mrule_defs[i].mrd_desc != NULL; i++ ) { + if( mrule_defs[i].mrd_usage == SLAP_MR_NONE ) { + fprintf( stderr, + "schema_init: Ingoring unusable matching rule %s\n", + mrule_defs[i].mrd_desc ); + continue; + } + res = register_matching_rule( mrule_defs[i].mrd_desc, + mrule_defs[i].mrd_usage, mrule_defs[i].mrd_convert, mrule_defs[i].mrd_normalize, mrule_defs[i].mrd_match, diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c index 25374fee69..d4c6d99e6e 100644 --- a/servers/slapd/schemaparse.c +++ b/servers/slapd/schemaparse.c @@ -178,31 +178,38 @@ static char * find_oidm(char *oid) { OidMacro *om; - char *new; - int pos, suflen; /* OID macros must start alpha */ - if ( !isdigit( *oid ) ) - { - for (om = om_list; om; om=om->som_next) - { - if ((pos = dscompare(om->som_name, oid, ':'))) - { - suflen = strlen(oid + pos); - new = ch_calloc(1, om->som_oid.bv_len + suflen + 1); - strcpy(new, om->som_oid.bv_val); - if (suflen) - { - suflen = om->som_oid.bv_len; - new[suflen++] = '.'; - strcpy(new+suflen, oid+pos+1); + if ( isdigit( *oid ) ) { + return oid; + } + + for (om = om_list; om; om=om->som_next) { + char **names = om->som_names; + + if( names == NULL ) { + continue; + } + + for( ; *names != NULL ; names++ ) { + int pos = dscompare(*names, oid, ':'); + + if( pos ) { + int suflen = strlen(oid + pos); + char *new = ch_calloc(1, + om->som_oid.bv_len + suflen + 1); + strcpy(new, om->som_oid.bv_val); + + if( suflen ) { + suflen = om->som_oid.bv_len; + new[suflen++] = '.'; + strcpy(new+suflen, oid+pos+1); + } + return new; } - return new; } - } - return NULL; } - return oid; + return NULL; } void @@ -213,15 +220,29 @@ parse_oidm( char **argv ) { + char *oid; OidMacro *om; if (argc != 3) { -usage: fprintf( stderr, "ObjectIdentifier \n"); + fprintf( stderr, "%s: line %d: too many arguments\n", + fname, lineno ); +usage: fprintf( stderr, "\tObjectIdentifier \n"); + exit( EXIT_FAILURE ); + } + + oid = find_oidm( argv[1] ); + if( oid != NULL ) { + fprintf( stderr, + "%s: line %d: " + "ObjectIdentifier \"%s\" previously defined \"%s\"", + fname, lineno, argv[1], oid ); exit( EXIT_FAILURE ); } om = (OidMacro *) ch_malloc( sizeof(OidMacro) ); - om->som_name = ch_strdup( argv[1] ); + + om->som_names = NULL; + charray_add( &om->som_names, argv[1] ); om->som_oid.bv_val = find_oidm( argv[2] ); if (!om->som_oid.bv_val) { diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 8e5c28fe97..2768528086 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -54,7 +54,7 @@ LDAP_BEGIN_DECL * JCG 05/1999 (gomez@engr.sgi.com) */ #define SLAP_MOD_SOFTADD 0x1000 -#undef LDAP_MOD_BVALUES +#undef LDAP_MOD_BVALUES /* we always use BVALUES */ #define ON 1 #define OFF (-1) @@ -65,26 +65,28 @@ LDAP_BEGIN_DECL /* psuedo error code to indicating abandoned operation */ #define SLAPD_ABANDON -1 -/* XXYYZ: these macros assume 'x' is an ASCII x */ -#define DNSEPARATOR(c) ((c) == ',' || (c) == ';') -#define SEPARATOR(c) ((c) == ',' || (c) == ';' || (c) == '+') -#define SPACE(c) ((c) == ' ' || (c) == '\n') - +/* We assume "C" locale, that is US-ASCII */ +#define ASCII_SPACE(c) ( (c) == ' ' ) #define ASCII_LOWER(c) ( (c) >= 'a' && (c) <= 'z' ) #define ASCII_UPPER(c) ( (c) >= 'A' && (c) <= 'Z' ) #define ASCII_ALPHA(c) ( ASCII_LOWER(c) || ASCII_UPPER(c) ) #define ASCII_DIGIT(c) ( (c) >= '0' && (c) <= '9' ) #define ASCII_ALNUM(c) ( ASCII_ALPHA(c) || ASCII_DIGIT(c) ) -#define LEADKEYCHAR(c) ( ASCII_ALPHA(c) ) -#define KEYCHAR(c) ( ASCII_ALNUM(c) || (c) == '-' ) -#define LEADOIDCHAR(c) ( ASCII_DIGIT(c) ) -#define OIDCHAR(c) ( ASCII_DIGIT(c) || (c) == '.' ) +#define DN_SEPARATOR(c) ((c) == ',' || (c) == ';') +#define RDN_SEPARATOR(c) ((c) == ',' || (c) == ';' || (c) == '+') +#define RDN_NEEDSESCAPE(c) ((c) == '\\' || (c) == '"') + +#define DESC_LEADCHAR(c) ( ASCII_ALPHA(c) ) +#define DESC_CHAR(c) ( ASCII_ALNUM(c) || (c) == '-' ) +#define OID_LEADCHAR(c) ( ASCII_DIGIT(c) ) +#define OID_CHAR(c) ( ASCII_DIGIT(c) || (c) == '.' ) -#define LEADATTRCHAR(c) ( LEADKEYCHAR(c) || LEADOIDCHAR(c) ) -#define ATTRCHAR(c) ( KEYCHAR((c)) || (c) == '.' ) +#define ATTR_LEADCHAR(c) ( DESC_LEADCHAR(c) || OID_LEADCHAR(c) ) +#define ATTR_CHAR(c) ( DESC_CHAR((c)) || (c) == '.' ) -#define NEEDSESCAPE(c) ((c) == '\\' || (c) == '"') +#define AD_LEADCHAR(c) ( ATTR_CHAR(c) ) +#define AD_CHAR(c) ( ATTR_CHAR(c) || (c) == ';' ) #define SLAPD_ACI_DEFAULT_ATTR "aci" @@ -122,8 +124,8 @@ LIBSLAPD_F (int) slap_debug; #define SLAP_SCHERR_MR_INCOMPLETE 12 typedef struct slap_oid_macro { - char *som_name; struct berval som_oid; + char **som_names; struct slap_oid_macro *som_next; } OidMacro; @@ -131,7 +133,6 @@ typedef struct slap_oid_macro { struct slap_syntax; struct slap_matching_rule; - typedef int slap_syntax_validate_func LDAP_P(( struct slap_syntax *syntax, struct berval * in)); @@ -166,6 +167,7 @@ typedef int slap_mr_convert_func LDAP_P(( /* Normalizer */ typedef int slap_mr_normalize_func LDAP_P(( + unsigned use, struct slap_syntax *syntax, /* NULL if in is asserted value */ struct slap_matching_rule *mr, struct berval * in, @@ -173,13 +175,15 @@ typedef int slap_mr_normalize_func LDAP_P(( /* Match (compare) function */ typedef int slap_mr_match_func LDAP_P(( + unsigned use, struct slap_syntax *syntax, /* syntax of stored value */ struct slap_matching_rule *mr, struct berval * value, - struct berval * assertValue )); + void * assertValue )); /* Index generation function */ typedef int slap_mr_indexer_func LDAP_P(( + unsigned use, struct slap_syntax *syntax, /* syntax of stored value */ struct slap_matching_rule *mr, struct berval **values, @@ -188,6 +192,7 @@ typedef int slap_mr_indexer_func LDAP_P(( struct slap_filter; /* forward declaration */ /* Filter index function */ typedef int slap_mr_filter_func LDAP_P(( + unsigned use, struct slap_syntax *syntax, /* syntax of stored value */ struct slap_matching_rule *mr, struct slap_filter *filter, @@ -195,6 +200,13 @@ typedef int slap_mr_filter_func LDAP_P(( typedef struct slap_matching_rule { LDAP_MATCHING_RULE smr_mrule; + unsigned smr_usage; +#define SLAP_MR_NONE 0x00U +#define SLAP_MR_EQUALITY 0x01U +#define SLAP_MR_APPROX 0x02U +#define SLAP_MR_ORDERING 0x04U +#define SLAP_MR_SUBSTR 0x08U +#define SLAP_MR_EXT 0x10U Syntax *smr_syntax; slap_mr_convert_func *smr_convert; slap_mr_normalize_func *smr_normalize; @@ -571,7 +583,7 @@ typedef struct slap_access { char *a_dn_pat; #ifdef SLAPD_SCHEMA_NOT_COMPAT - AttributeType *a_dn_at; + AttributeDescription *a_dn_at; #else char *a_dn_at; #endif @@ -585,7 +597,7 @@ typedef struct slap_access { #ifdef SLAPD_ACI_ENABLED #ifdef SLAPD_SCHEMA_NOT_COMPAT - AttributeType *a_aci_at; + AttributeDescription *a_aci_at; #else char *a_aci_at; #endif @@ -595,7 +607,7 @@ typedef struct slap_access { char *a_group_pat; char *a_group_oc; #ifdef SLAPD_SCHEMA_NOT_COMPAT - AttributeType *a_group_at; + AttributeDescription *a_group_at; #else char *a_group_at; #endif @@ -846,7 +858,7 @@ struct slap_backend_info { int (*bi_acl_group) LDAP_P((Backend *bd, Entry *e, const char *bdn, const char *edn, const char *objectclassValue, - AttributeType *group_at )); + AttributeDescription *group_at )); #else int (*bi_acl_group) LDAP_P((Backend *bd, Entry *e, const char *bdn, const char *edn, diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c index b4fbcac553..7af30358ea 100644 --- a/servers/slapd/str2filter.c +++ b/servers/slapd/str2filter.c @@ -16,18 +16,14 @@ #include "slap.h" #include -static char *find_matching_paren(char *s); -static Filter *str2list(char *str, long unsigned int ftype); -static Filter *str2simple(char *str); -static int str2subvals(char *val, Filter *f); +static char *find_matching_paren( const char *s ); +static Filter *str2list( const char *str, long unsigned int ftype); +static Filter *str2simple( const char *str); +static int str2subvals( const char *val, Filter *f); Filter * -str2filter( char *str ) +str2filter( const char *str ) { -#ifdef SLAPD_SCHEMA_NOT_COMPAT - /* not yet implemented */ - return NULL; -#else Filter *f = NULL; char *end, *freeme; @@ -94,16 +90,14 @@ str2filter( char *str ) free( freeme ); return( f ); -#endif } -#ifndef SLAPD_SCHEMA_NOT_COMPAT /* * Put a list of filters like this "(filter1)(filter2)..." */ static Filter * -str2list( char *str, unsigned long ftype ) +str2list( const char *str, unsigned long ftype ) { Filter *f; Filter **fp; @@ -146,7 +140,7 @@ str2list( char *str, unsigned long ftype ) } static Filter * -str2simple( char *str ) +str2simple( const char *str ) { Filter *f; char *s; @@ -157,7 +151,7 @@ str2simple( char *str ) if ( (s = strchr( str, '=' )) == NULL ) { return( NULL ); } - value = s + 1; + value = &s[1]; *s-- = '\0'; savechar = *s; @@ -176,6 +170,11 @@ str2simple( char *str ) f->f_choice = LDAP_FILTER_APPROX; *s = '\0'; break; + case ':': + f->f_choice = LDAP_FILTER_EXT; + *s = '\0'; + break; + default: if ( ldap_pvt_find_wildcard( value ) == NULL ) { f->f_choice = LDAP_FILTER_EQUALITY; @@ -183,6 +182,7 @@ str2simple( char *str ) f->f_choice = LDAP_FILTER_PRESENT; } else { f->f_choice = LDAP_FILTER_SUBSTRINGS; +#ifndef SLAPD_SCHEMA_NOT_COMPAT f->f_sub_type = ch_strdup( str ); if ( str2subvals( value, f ) != 0 ) { filter_free( f ); @@ -191,10 +191,12 @@ str2simple( char *str ) } *(value-1) = '='; return( f ); +#endif } break; } +#ifndef SLAPD_SCHEMA_NOT_COMPAT if ( f->f_choice == LDAP_FILTER_PRESENT ) { f->f_type = ch_strdup( str ); } else { @@ -206,20 +208,21 @@ str2simple( char *str ) *s = savechar; *(value-1) = '='; +#endif return( f ); } static int -str2subvals( char *val, Filter *f ) +str2subvals( const char *in, Filter *f ) { - char *nextstar, *freeme; + char *nextstar, *val, *freeme; int gotstar; - Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", val, 0, 0 ); + Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", in, 0, 0 ); - if( val == NULL ) return 0; + if( in == NULL ) return 0; - val = freeme = ch_strdup( val ); + val = freeme = ch_strdup( in ); gotstar = 0; while ( *val ) { @@ -252,7 +255,7 @@ str2subvals( char *val, Filter *f ) */ static char * -find_matching_paren( char *s ) +find_matching_paren( const char *s ) { int balance, escape; @@ -266,7 +269,7 @@ find_matching_paren( char *s ) balance--; } if ( balance == 0 ) { - return( s ); + return (char *) s; } if ( *s == '\\' && ! escape ) escape = 1; @@ -274,7 +277,5 @@ find_matching_paren( char *s ) escape = 0; } - return( NULL ); + return NULL; } - -#endif diff --git a/servers/slapd/suffixalias.c b/servers/slapd/suffixalias.c index 2e4120e8dd..172e543843 100644 --- a/servers/slapd/suffixalias.c +++ b/servers/slapd/suffixalias.c @@ -50,7 +50,7 @@ char *suffix_alias( /* alias is longer than dn */ continue; } else if ( diff > 0 ) { - if ( ! DNSEPARATOR(dn[diff-1]) ) { + if ( ! DN_SEPARATOR(dn[diff-1]) ) { /* boundary is not at a DN separator */ continue; }