From 490bb72f82606c6872ec61d035467a0a912b4de7 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 19 Oct 1998 23:51:45 +0000 Subject: [PATCH] Remove DEFS variables from Makefiles, remove bridge.h. Rely on portable.h. --- acconfig.h | 66 ++- build/top.mk | 6 +- clients/ud/Makefile.in | 1 - configure | 723 +++++++++++++------------- configure.in | 97 +--- include/avl.h | 4 + include/bridge.h | 214 -------- include/lber.h | 27 - include/ldap.h | 350 +++++++++---- include/lthread_rdwr.h | 16 +- include/portable.h.bot | 1 - include/portable.h.in | 68 ++- include/proto-lber.h | 102 ---- include/proto-ldap.h | 276 ---------- libraries/libldap/url.c | 19 +- libraries/libldbm/Makefile.in | 1 - libraries/liblthread/Makefile.in | 1 - libraries/liblutil/Makefile.in | 1 - servers/ldapd/Makefile.in | 1 - servers/slapd/Makefile.in | 1 - servers/slapd/back-ldbm/Makefile.in | 1 - servers/slapd/back-passwd/Makefile.in | 1 - servers/slapd/back-shell/Makefile.in | 1 - servers/slapd/tools/Makefile.in | 1 - servers/slurpd/Makefile.in | 1 - 25 files changed, 789 insertions(+), 1191 deletions(-) delete mode 100644 include/bridge.h delete mode 100644 include/proto-lber.h delete mode 100644 include/proto-ldap.h diff --git a/acconfig.h b/acconfig.h index cd0780d583..2e363ba7fa 100644 --- a/acconfig.h +++ b/acconfig.h @@ -9,14 +9,11 @@ #undef DECL_SYS_ERRLIST /* define if you have berkeley db */ -#undef HAVE_BERKELEY_DB2 +#undef HAVE_BERKELEY_DB /* define if you have berkeley db2 */ #undef HAVE_BERKELEY_DB2 -/* define if you have Mach CThreads */ -#undef HAVE_CTHREADS - /* define if you have crypt */ #undef HAVE_CRYPT @@ -44,6 +41,9 @@ /* define if you have NDBM */ #undef HAVE_NDBM +/* define if you have Mach CThreads */ +#undef HAVE_MACH_CTHREADS + /* define if you have a preemptive POSIX Threads implementation */ #undef HAVE_PREEMPTIVE_PTHREADS @@ -56,44 +56,80 @@ /* define if you have -ltermcap */ #undef HAVE_TERMCAP +/* define if you have -lwrap */ +#undef HAVE_TCPD + /* define this for connectionless LDAP support */ #undef LDAP_CONNECTIONLESS +/* define this to add debugging code */ +#undef LDAP_DEBUG + +/* define this for LDAP DNS support */ +#undef LDAP_DNS + /* define this to remove -lldap cache support */ #undef LDAP_NOCACHE /* define this for LDAP referrals support */ #undef LDAP_REFERRALS +/* define this for LDAP User Interface support */ +#undef LDAP_LIBUI + /* define this for ACL Group support */ #undef SLAPD_ACLGROUPS -/* define this for Reverse Lookup support */ -#undef SLAPD_RLOOKUPS +/* define this for crypt(3) password support */ +#undef SLAPD_CRYPT + +/* define this to use SLAPD LDBM backend */ +#undef SLAPD_LDBM + +/* define this for MD5 password support */ +#undef SLAPD_MD5 + +/* define this to use SLAPD passwd backend */ +#undef SLAPD_PASSWD /* define this for phonetic support */ #undef SLAPD_PHONETIC +/* define this for Reverse Lookup support */ +#undef SLAPD_RLOOKUPS + +/* define this for SHA1 password support */ +#undef SLAPD_SHA1 + /* define this to use SLAPD shell backend */ -/* #undef SLAPD_SHELL */ +#undef SLAPD_SHELL -/* define this to use SLAPD passwd backend */ -/* #undef SLAPD_PASSWD */ +/* define this to use DB2 in native mode */ +#undef LDBM_USE_DB2 -/* define this to use SLAPD LDBM backend */ -/* #undef SLAPD_LDBM */ +/* define this to use DB2 in compat185 mode */ +#undef LDBM_USE_DB2_COMPAT185 /* define this to use DBBTREE w/ LDBM backend */ -/* #undef LDBM_USE_DBBTREE */ +#undef LDBM_USE_DBBTREE /* define this to use DBHASH w/ LDBM backend */ -/* #undef LDBM_USE_DBHASH */ +#undef LDBM_USE_DBHASH /* define this to use GDBM w/ LDBM backend */ -/* #undef LDBM_USE_GDBM */ +#undef LDBM_USE_GDBM /* define this to use NDBM w/ LDBM backend */ -/* #undef LDBM_USE_NDBM */ +#undef LDBM_USE_NDBM + +/* define this if you want no termcap support */ +#undef NO_TERMCAP + +/* define this if you want no thread support */ +#undef NO_THREADS + +/* define this if the thread package is preemptive */ +#undef THREAD_PREEMPTIVE /* Leave that blank line there!! Autoheader needs it. */ diff --git a/build/top.mk b/build/top.mk index 6d36dc1d6f..a94504895f 100644 --- a/build/top.mk +++ b/build/top.mk @@ -69,19 +69,17 @@ LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBDIR)/libldap.a $(LDAP_LIBDIR # AutoConfig generated AC_CC = @CC@ -AC_DEFS = @CPPFLAGS@ @DEFS@ @LDAP_DEFS@ +AC_DEFS = @CPPFLAGS@ @DEFS@ AC_LIBS = @LDFLAGS@ @LIBS@ AC_CFLAGS = @CFLAGS@ AC_LDFLAGS = -KRB_DEFS = @KRB_DEFS@ KRB_LIBS = @KRB_LIBS@ -TERMCAP_DEFS = @TERMCAP_DEFS@ TERMCAP_LIBS = @TERMCAP_LIBS@ # Our Defaults CC = $(AC_CC) -DEFS = $(LDAP_DEFS) $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) +DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) LIBS = $(LDAP_LIBS) $(XLIBS) $(AC_LIBS) CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES) diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in index 3af751457c..1c72cf0e22 100644 --- a/clients/ud/Makefile.in +++ b/clients/ud/Makefile.in @@ -9,7 +9,6 @@ PROGRAMS= ud LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XDEFS = $(TERMCAP_DEFS) XLIBS = $(TERMCAP_LIBS) ud : version.o diff --git a/configure b/configure index 931c2eefe9..afdc7fe1f5 100755 --- a/configure +++ b/configure @@ -1177,20 +1177,13 @@ fi echo "$ac_t""done" 1>&6 ## Initialize vars -LDAP_DEFS= LDAP_LIBS= -LDBM_DEFS= LDBM_LIBS= -LTHREAD_DEFS= LTHREAD_LIBS= -LUTIL_DEFS= LUTIL_LIBS= -LDAPD_DEFS= LDAPD_LIBS= -SLAPD_DEFS= SLAPD_LIBS= -SLURPD_DEFS= SLURPD_LIBS= BUILD_LDAPD=no @@ -1201,14 +1194,12 @@ BUILD_LDBM=no BUILD_PASSWD=no BUILD_SHELL=no -KRB_DEFS= KRB_LIBS= -TERMCAP_DEFS= TERMCAP_LIBS= echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1212: checking whether ln -s works" >&5 +echo "configure:1203: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1239,7 +1230,7 @@ fi # 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:1243: checking for a BSD compatible install" >&5 +echo "configure:1234: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1291,7 +1282,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' # 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:1295: checking for $ac_word" >&5 +echo "configure:1286: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1318,7 +1309,7 @@ else fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1322: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1313: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1348,7 +1339,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:1352: checking for $ac_word" >&5 +echo "configure:1343: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SENDMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1380,7 +1371,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:1384: checking for $ac_word" >&5 +echo "configure:1375: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1412,7 +1403,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:1416: checking for $ac_word" >&5 +echo "configure:1407: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FINGER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1445,7 +1436,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:1449: checking for $ac_word" >&5 +echo "configure:1440: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1474,7 +1465,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:1478: checking for $ac_word" >&5 +echo "configure:1469: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1522,7 +1513,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1526: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1517: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1532,11 +1523,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 @@ -1556,12 +1547,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 $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1560: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1551: checking whether the C compiler ($CC $CFLAGS $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:1565: checking whether we are using GNU C" >&5 +echo "configure:1556: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1570,7 +1561,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1574: \"$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:1565: \"$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 @@ -1585,7 +1576,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1589: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1580: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1613,7 +1604,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1617: checking how to run the C preprocessor" >&5 +echo "configure:1608: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1628,13 +1619,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:1638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1645,13 +1636,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:1655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1675,13 +1666,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1679: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1670: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1699,7 +1690,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1722,9 +1713,9 @@ fi echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1726: checking for AIX" >&5 +echo "configure:1717: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1750: checking for POSIXized ISC" >&5 +echo "configure:1741: 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 @@ -1768,17 +1759,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:1772: checking for minix/config.h" >&5 +echo "configure:1763: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'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:1782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1819,12 +1810,12 @@ fi echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:1823: checking for socket" >&5 +echo "configure:1814: checking for socket" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:1842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -1866,7 +1857,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:1870: checking for main in -lsocket" >&5 +echo "configure:1861: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1874,14 +1865,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1909,7 +1900,7 @@ else fi echo $ac_n "checking for main in -lnet""... $ac_c" 1>&6 -echo "configure:1913: checking for main in -lnet" >&5 +echo "configure:1904: checking for main in -lnet" >&5 ac_lib_var=`echo net'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1917,14 +1908,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1952,7 +1943,7 @@ else fi echo $ac_n "checking for main in -lnsl_s""... $ac_c" 1>&6 -echo "configure:1956: checking for main in -lnsl_s" >&5 +echo "configure:1947: checking for main in -lnsl_s" >&5 ac_lib_var=`echo nsl_s'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1960,14 +1951,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl_s $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1995,7 +1986,7 @@ else fi echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:1999: checking for main in -lnsl" >&5 +echo "configure:1990: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2003,14 +1994,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2038,7 +2029,7 @@ else fi echo $ac_n "checking for socket in -linet""... $ac_c" 1>&6 -echo "configure:2042: checking for socket in -linet" >&5 +echo "configure:2033: checking for socket in -linet" >&5 ac_lib_var=`echo inet'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2046,7 +2037,7 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2085,7 +2076,7 @@ else fi echo $ac_n "checking for main in -lgen""... $ac_c" 1>&6 -echo "configure:2089: checking for main in -lgen" >&5 +echo "configure:2080: checking for main in -lgen" >&5 ac_lib_var=`echo gen'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2093,14 +2084,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2132,7 +2123,7 @@ fi echo $ac_n "checking for sigset in -lV3""... $ac_c" 1>&6 -echo "configure:2136: checking for sigset in -lV3" >&5 +echo "configure:2127: checking for sigset in -lV3" >&5 ac_lib_var=`echo V3'_'sigset | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2140,7 +2131,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lV3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2184,17 +2175,17 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2188: checking for $ac_hdr" >&5 +echo "configure:2179: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:2198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2223,7 +2214,7 @@ done if test $ac_cv_header_kerberosIV_krb_h = yes ; then echo $ac_n "checking for main in -lkrb4""... $ac_c" 1>&6 -echo "configure:2227: checking for main in -lkrb4" >&5 +echo "configure:2218: checking for main in -lkrb4" >&5 ac_lib_var=`echo krb4'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2231,14 +2222,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb4 -lkrb5 -ldes425 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2269,7 +2260,6 @@ fi EOF - KRB_DEFS="-DKERBEROS" KRB_LIBS="-lkrb4 -lkrb5 -ldes425" fi fi @@ -2279,17 +2269,17 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2283: checking for $ac_hdr" >&5 +echo "configure:2273: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:2293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2318,7 +2308,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:2322: checking for main in -lkrb" >&5 +echo "configure:2312: checking for main in -lkrb" >&5 ac_lib_var=`echo krb'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2326,14 +2316,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lkrb -ldes $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2364,7 +2354,6 @@ fi EOF - KRB_DEFS="-DKERBEROS" KRB_LIBS="-lkrb -ldes" fi fi @@ -2377,17 +2366,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2381: checking for $ac_hdr" >&5 +echo "configure:2370: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:2391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2416,13 +2405,13 @@ done if test $ac_cv_header_pthread_h = yes ; then echo $ac_n "checking POSIX thread version""... $ac_c" 1>&6 -echo "configure:2420: checking POSIX thread version" >&5 +echo "configure:2409: checking POSIX thread version" >&5 if eval "test \"`echo '$''{'ol_cv_pthread_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -2444,7 +2433,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -2479,13 +2468,11 @@ echo "$ac_t""$ol_cv_pthread_version" 1>&6 if test $ol_cv_pthread_version = final ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DPOSIX_THREADS" - elif test $ol_cv_pthread_version = draft4 ; then + elif test $ol_cv_pthread_version = draft4 ; then cat >> confdefs.h <<\EOF #define HAVE_PTHREADS_D4 1 EOF - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_MIT_PTHREADS" else { echo "configure: error: unknown pthread version" 1>&2; exit 1; } fi @@ -2495,7 +2482,7 @@ EOF echo $ac_n "checking for LinuxThreads""... $ac_c" 1>&6 -echo "configure:2499: checking for LinuxThreads" >&5 +echo "configure:2486: checking for LinuxThreads" >&5 if eval "test \"`echo '$''{'ol_cv_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2517,17 +2504,16 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6 #define HAVE_LINUX_THREADS 1 EOF - LTHREAD_DEFS="$LTHREAD_DEFS -DLINUX_THREADS" fi echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -echo "configure:2526: checking for pthread_create" >&5 +echo "configure:2512: checking for pthread_create" >&5 if eval "test \"`echo '$''{'ac_cv_func_pthread_create'+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; then +if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_pthread_create=yes" else @@ -2572,7 +2558,7 @@ fi if test $ol_link_threads = no ; then echo $ac_n "checking for pthread_create with -pthread""... $ac_c" 1>&6 -echo "configure:2576: checking for pthread_create with -pthread" >&5 +echo "configure:2562: checking for pthread_create with -pthread" >&5 if eval "test \"`echo '$''{'ol_cv_pthread_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2580,7 +2566,7 @@ else save_LIBS="$LIBS" LIBS="-pthread $LIBS" cat > conftest.$ac_ext < int main() { @@ -2590,7 +2576,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_cv_pthread_flag=yes else @@ -2615,7 +2601,7 @@ echo "$ac_t""$ol_cv_pthread_flag" 1>&6 if test $ol_link_threads = no ; then save_LIBS="$LIBS" echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:2619: checking for pthread_create in -lpthread" >&5 +echo "configure:2605: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2623,7 +2609,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2662,7 +2648,7 @@ fi if test $ol_link_threads = no ; then save_LIBS="$LIBS" echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:2666: checking for pthread_create in -lc_r" >&5 +echo "configure:2652: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2670,7 +2656,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2709,7 +2695,7 @@ fi if test $ol_link_threads = no ; then save_LIBS="$LIBS" echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:2713: checking for pthread_create in -lpthread" >&5 +echo "configure:2699: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2720,7 +2706,7 @@ LIBS="-lpthread if test $with_preemptive = auto ; then fi -lmach -lexc -lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2752,7 +2738,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then EOF ol_link_threads=posix - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_DCE_THREADS" LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc" else echo "$ac_t""no" 1>&6 @@ -2769,18 +2754,17 @@ EOF save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" - CPPFLAGS="$LTHREAD_DEFS $CPPFLAGS" LIBS="$LTHREAD_LIBS $LIBS" for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2779: checking for $ac_func" >&5 +echo "configure:2763: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2838,12 +2822,12 @@ done for ac_func in pthread_kill do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2842: checking for $ac_func" >&5 +echo "configure:2826: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2893,13 +2877,13 @@ done if test $ol_with_preemptive = auto ; then echo $ac_n "checking for preemptive Pthread implementation""... $ac_c" 1>&6 -echo "configure:2897: checking for preemptive Pthread implementation" >&5 +echo "configure:2881: checking for preemptive Pthread implementation" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: crossing compiling: use --with-preemptive=yes|no|manual" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -2943,7 +2927,7 @@ int argc; char **argv; } EOF -if { (eval echo configure:2947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ol_pthread_preemptive=yes else @@ -2983,17 +2967,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = cthreads ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2987: checking for $ac_hdr" >&5 +echo "configure:2971: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:2997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3021,7 +3005,7 @@ done if test $ac_cv_header_lwp_lwp_h = yes ; then echo $ac_n "checking for cthread_fork in -llwp""... $ac_c" 1>&6 -echo "configure:3025: checking for cthread_fork in -llwp" >&5 +echo "configure:3009: checking for cthread_fork in -llwp" >&5 ac_lib_var=`echo lwp'_'cthread_fork | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3029,7 +3013,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llwp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3064,10 +3048,9 @@ fi if test $have_cthreads = yes ; then cat >> confdefs.h <<\EOF -#define HAVE_CTHREADS 1 +#define HAVE_MACH_CTHREADS 1 EOF - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_NEXT_CTHREADS" LTHREAD_LIBS="$LTHREAD_LIBS -llwp" fi fi @@ -3078,17 +3061,17 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3082: checking for $ac_hdr" >&5 +echo "configure:3065: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3116,7 +3099,7 @@ done if test $ac_cv_header_lwp_lwp_h = yes ; then echo $ac_n "checking for thr_create in -lthread""... $ac_c" 1>&6 -echo "configure:3120: checking for thr_create in -lthread" >&5 +echo "configure:3103: checking for thr_create in -lthread" >&5 ac_lib_var=`echo thread'_'thr_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3124,7 +3107,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3166,7 +3149,6 @@ EOF #define HAVE_LWP_THR 1 EOF - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS5_LWP" LTHREAD_LIBS="$LTHREAD_LIBS -llwp" fi fi @@ -3175,17 +3157,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3179: checking for $ac_hdr" >&5 +echo "configure:3161: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3213,7 +3195,7 @@ done if test $ac_cv_header_thread_h = yes -a $ac_cv_header_synch_h = yes ; then echo $ac_n "checking for lwp_create in -llwp""... $ac_c" 1>&6 -echo "configure:3217: checking for lwp_create in -llwp" >&5 +echo "configure:3199: checking for lwp_create in -llwp" >&5 ac_lib_var=`echo lwp'_'lwp_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3221,7 +3203,7 @@ else ac_save_LIBS="$LIBS" LIBS="-llwp $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3259,7 +3241,6 @@ fi #define HAVE_LWP 1 EOF - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS4_LWP" LTHREAD_LIBS="$LTHREAD_LIBS -llwp" if test $with_preemptive = auto ; then @@ -3270,7 +3251,10 @@ EOF fi if test $ol_with_preemptive = yes ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_PREEMPTIVE" + cat >> confdefs.h <<\EOF +#define THREAD_PREEMPTIVE 1 +EOF + fi if test $ol_with_threads = manual ; then @@ -3282,17 +3266,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:3286: checking for $ac_hdr" >&5 +echo "configure:3270: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3321,12 +3305,12 @@ done for ac_func in sched_yield pthread_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3325: checking for $ac_func" >&5 +echo "configure:3309: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3375,7 +3359,7 @@ done echo $ac_n "checking for LinuxThreads""... $ac_c" 1>&6 -echo "configure:3379: checking for LinuxThreads" >&5 +echo "configure:3363: checking for LinuxThreads" >&5 if eval "test \"`echo '$''{'ol_cv_linux_threads'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3396,17 +3380,17 @@ echo "$ac_t""$ol_cv_linux_threads" 1>&6 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3400: checking for $ac_hdr" >&5 +echo "configure:3384: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3410: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3436,17 +3420,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3440: checking for $ac_hdr" >&5 +echo "configure:3424: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3476,17 +3460,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3480: checking for $ac_hdr" >&5 +echo "configure:3464: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3524,20 +3508,23 @@ if test $ol_link_threads = no ; then $ol_with_threads = no fi - LTHREAD_DEFS="-DNO_THREADS" + cat >> confdefs.h <<\EOF +#define NO_THREADS 1 +EOF + LTHREAD_LIBS="" 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:3535: checking for DB2 library" >&5 +echo "configure:3522: checking for DB2 library" >&5 if eval "test \"`echo '$''{'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_open in -ldb""... $ac_c" 1>&6 -echo "configure:3541: checking for db_open in -ldb" >&5 +echo "configure:3528: checking for db_open in -ldb" >&5 ac_lib_var=`echo db'_'db_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3545,7 +3532,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3587,17 +3574,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:3591: checking for $ac_hdr" >&5 +echo "configure:3578: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3588: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3625,13 +3612,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:3629: checking if db.h is DB2" >&5 +echo "configure:3616: checking if db.h is DB2" >&5 if eval "test \"`echo '$''{'ol_cv_header_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -3663,7 +3650,7 @@ fi echo $ac_n "checking for Berkeley DB2""... $ac_c" 1>&6 -echo "configure:3667: checking for Berkeley DB2" >&5 +echo "configure:3654: checking for Berkeley DB2" >&5 if eval "test \"`echo '$''{'ol_cv_berkeley_db2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3689,12 +3676,16 @@ EOF ol_link_ldbm=db2 ol_with_ldbm_api=db2 - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2" - if test $ol_with_ldbm_type = hash ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" + cat >> confdefs.h <<\EOF +#define LDBM_USE_DBHASH 1 +EOF + else - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + cat >> confdefs.h <<\EOF +#define LDBM_USE_DBBTREE 1 +EOF + fi if test $ol_cv_lib_db2 != yes ; then @@ -3705,18 +3696,18 @@ 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:3709: checking for Berkeley DB library" >&5 +echo "configure:3700: checking for Berkeley DB library" >&5 if eval "test \"`echo '$''{'ol_cv_lib_db'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ol_LIBS="$LIBS" echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:3715: checking for dbopen" >&5 +echo "configure:3706: checking for dbopen" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:3734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -3758,7 +3749,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:3762: checking for dbopen in -ldb" >&5 +echo "configure:3753: checking for dbopen in -ldb" >&5 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3766,7 +3757,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldb $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3812,17 +3803,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:3816: checking for $ac_hdr" >&5 +echo "configure:3807: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3858,7 +3849,7 @@ fi echo $ac_n "checking for Berkeley DB""... $ac_c" 1>&6 -echo "configure:3862: checking for Berkeley DB" >&5 +echo "configure:3853: checking for Berkeley DB" >&5 if eval "test \"`echo '$''{'ol_cv_berkeley_db'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3884,14 +3875,16 @@ EOF ol_link_ldbm=db ol_with_ldbm_api=db - if test $ac_cv_header_db_185_h = yes ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2_COMPAT185" - fi - if test $ol_with_ldbm_type = hash ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" + cat >> confdefs.h <<\EOF +#define LDBM_USE_DBHASH 1 +EOF + else - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + cat >> confdefs.h <<\EOF +#define LDBM_USE_DBBTREE 1 +EOF + fi if test $ol_cv_lib_db != yes ; then @@ -3909,17 +3902,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:3913: checking for $ac_hdr" >&5 +echo "configure:3906: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:3923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3954,18 +3947,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:3958: checking for GDBM library" >&5 +echo "configure:3951: checking for GDBM library" >&5 if eval "test \"`echo '$''{'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:3964: checking for gdbm_open" >&5 +echo "configure:3957: checking for gdbm_open" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gdbm_open=yes" else @@ -4007,7 +4000,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 -echo "configure:4011: checking for gdbm_open in -lgdbm" >&5 +echo "configure:4004: checking for gdbm_open in -lgdbm" >&5 ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4015,7 +4008,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgdbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4061,17 +4054,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:4065: checking for $ac_hdr" >&5 +echo "configure:4058: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:4075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4098,7 +4091,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:4102: checking for db" >&5 +echo "configure:4095: checking for db" >&5 if eval "test \"`echo '$''{'ol_cv_gdbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4124,8 +4117,6 @@ EOF ol_link_ldbm=gdbm ol_with_ldbm_api=gdbm - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_GDBM" - if test $ol_cv_lib_gdbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm" fi @@ -4134,18 +4125,18 @@ fi if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then echo $ac_n "checking for NDBM library""... $ac_c" 1>&6 -echo "configure:4138: checking for NDBM library" >&5 +echo "configure:4129: checking for NDBM library" >&5 if eval "test \"`echo '$''{'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:4144: checking for dbm_open" >&5 +echo "configure:4135: checking for dbm_open" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:4163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -4187,7 +4178,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -lndbm""... $ac_c" 1>&6 -echo "configure:4191: checking for dbm_open in -lndbm" >&5 +echo "configure:4182: checking for dbm_open in -lndbm" >&5 ac_lib_var=`echo ndbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4195,7 +4186,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lndbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4226,7 +4217,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:4230: checking for dbm_open in -ldbm" >&5 +echo "configure:4221: checking for dbm_open in -ldbm" >&5 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4234,7 +4225,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4282,17 +4273,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:4286: checking for $ac_hdr" >&5 +echo "configure:4277: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:4296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4287: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4319,7 +4310,7 @@ fi done echo $ac_n "checking for db""... $ac_c" 1>&6 -echo "configure:4323: checking for db" >&5 +echo "configure:4314: checking for db" >&5 if eval "test \"`echo '$''{'ol_cv_ndbm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4349,8 +4340,6 @@ EOF echo "configure: warning: Attempting to use NDBM. Functionality will be limited." 1>&2 fi - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_NDBM" - if test $ol_cv_lib_ndbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm" fi @@ -4369,7 +4358,7 @@ fi if test $ol_enable_wrappers = yes ; then echo $ac_n "checking for hosts_access in -lwrap""... $ac_c" 1>&6 -echo "configure:4373: checking for hosts_access in -lwrap" >&5 +echo "configure:4362: checking for hosts_access in -lwrap" >&5 ac_lib_var=`echo wrap'_'hosts_access | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4377,7 +4366,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lwrap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4411,7 +4400,10 @@ fi if test $have_wrappers = yes ; then - SLAPD_DEFS="$SLAPD_DEFS -DTCP_WRAPPERS" + cat >> confdefs.h <<\EOF +#define HAVE_TCPD 1 +EOF + SLAPD_LIBS="$SLAPD_LIBS -lwrap" else echo "configure: warning: could not find -lwrap" 1>&2 @@ -4431,17 +4423,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:4435: checking for $ac_hdr" >&5 +echo "configure:4427: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:4445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4470,7 +4462,7 @@ done if test $ol_link_termcap = no ; then echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6 -echo "configure:4474: checking for tputs in -ltermcap" >&5 +echo "configure:4466: checking for tputs in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tputs | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4478,7 +4470,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4522,7 +4514,7 @@ fi if test $ol_link_termcap = no ; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:4526: checking for initscr in -lncurses" >&5 +echo "configure:4518: checking for initscr in -lncurses" >&5 ac_lib_var=`echo ncurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4530,7 +4522,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lncurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4573,19 +4565,22 @@ EOF fi if test $ol_link_termcap = no ; then - TERMCAP_DEFS="-DNOTERMCAP" + cat >> confdefs.h <<\EOF +#define NO_TERMCAP 1 +EOF + TERMCAP_LIBS= fi # FreeBSD (and others) have crypt(3) in -lcrypt if test $ol_enable_crypt != no ; then echo $ac_n "checking for crypt""... $ac_c" 1>&6 -echo "configure:4584: checking for crypt" >&5 +echo "configure:4579: checking for crypt" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:4607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -4627,7 +4622,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:4631: checking for crypt in -lcrypt" >&5 +echo "configure:4626: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4635,7 +4630,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4672,7 +4667,10 @@ fi if test $have_crypt = yes ; then - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_CRYPT" + cat >> confdefs.h <<\EOF +#define HAVE_CRYPT 1 +EOF + else echo "configure: warning: could not find crypt" 1>&2 if test $ol_enable_crypt = yes ; then @@ -4685,12 +4683,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4689: checking for ANSI C header files" >&5 +echo "configure:4687: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4698,7 +4696,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4715,7 +4713,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 @@ -4733,7 +4731,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 @@ -4754,7 +4752,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4765,7 +4763,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4793,12 +4791,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:4797: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4795: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'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> @@ -4806,7 +4804,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4831,7 +4829,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:4835: checking for opendir in -ldir" >&5 +echo "configure:4833: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4839,7 +4837,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4872,7 +4870,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4876: checking for opendir in -lx" >&5 +echo "configure:4874: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4880,7 +4878,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4914,12 +4912,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4918: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:4916: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4935,7 +4933,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4972,17 +4970,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:4976: checking for $ac_hdr" >&5 +echo "configure:4974: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'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:4986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5010,12 +5008,12 @@ done echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5014: checking for uid_t in sys/types.h" >&5 +echo "configure:5012: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5044,7 +5042,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:5048: checking type of array argument to getgroups" >&5 +echo "configure:5046: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5052,7 +5050,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -5091,7 +5089,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -5115,12 +5113,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5119: checking for mode_t" >&5 +echo "configure:5117: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5148,12 +5146,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5152: checking for off_t" >&5 +echo "configure:5150: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5181,12 +5179,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5185: checking for pid_t" >&5 +echo "configure:5183: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5214,12 +5212,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5218: checking return type of signal handlers" >&5 +echo "configure:5216: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5236,7 +5234,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:5240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5255,12 +5253,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5259: checking for size_t" >&5 +echo "configure:5257: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -5288,12 +5286,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5292: checking for uid_t in sys/types.h" >&5 +echo "configure:5290: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5322,12 +5320,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:5326: checking for st_blksize in struct stat" >&5 +echo "configure:5324: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5335,7 +5333,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:5339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -5356,12 +5354,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:5360: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5358: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5370,7 +5368,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:5374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -5391,12 +5389,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5395: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5393: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5404,7 +5402,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5426,12 +5424,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5430: checking for working const" >&5 +echo "configure:5428: checking for working const" >&5 if eval "test \"`echo '$''{'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:5482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5503,7 +5501,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:5507: checking for 8-bit clean memcmp" >&5 +echo "configure:5505: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5511,7 +5509,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -5539,12 +5537,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" echo $ac_n "checking for strftime""... $ac_c" 1>&6 -echo "configure:5543: checking for strftime" >&5 +echo "configure:5541: checking for strftime" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:5569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -5589,7 +5587,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:5593: checking for strftime in -lintl" >&5 +echo "configure:5591: checking for strftime in -lintl" >&5 ac_lib_var=`echo intl'_'strftime | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5597,7 +5595,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5635,12 +5633,12 @@ fi fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5639: checking for vprintf" >&5 +echo "configure:5637: checking for vprintf" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -5687,12 +5685,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:5691: checking for _doprnt" >&5 +echo "configure:5689: checking for _doprnt" >&5 if eval "test \"`echo '$''{'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; then +if { (eval echo configure:5717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -5740,7 +5738,7 @@ fi fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:5744: checking for wait3 that fills in rusage" >&5 +echo "configure:5742: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5748,7 +5746,7 @@ else ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext < #include @@ -5779,7 +5777,7 @@ main() { } } EOF -if { (eval echo configure:5783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -5829,12 +5827,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5833: checking for $ac_func" >&5 +echo "configure:5831: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5885,12 +5883,12 @@ done for ac_func in strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5889: checking for $ac_func" >&5 +echo "configure:5887: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5943,13 +5941,13 @@ done # Check Configuration echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:5947: checking declaration of sys_errlist" >&5 +echo "configure:5945: checking declaration of sys_errlist" >&5 if eval "test \"`echo '$''{'ol_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5959,7 +5957,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:5963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_dcl_sys_errlist=yes else @@ -5980,20 +5978,20 @@ if test $ol_cv_dcl_sys_errlist = no ; then EOF echo $ac_n "checking existence of sys_errlist""... $ac_c" 1>&6 -echo "configure:5984: checking existence of sys_errlist" >&5 +echo "configure:5982: checking existence of sys_errlist" >&5 if eval "test \"`echo '$''{'ol_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:5997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_cv_have_sys_errlist=yes else @@ -6011,22 +6009,40 @@ fi if test $ol_enable_debug != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG" + cat >> confdefs.h <<\EOF +#define LDAP_DEBUG 1 +EOF + fi if test $ol_enable_libui = yes ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_LIBUI" + cat >> confdefs.h <<\EOF +#define LDAP_LIBUI 1 +EOF + fi if test $ol_enable_cache = no ; then - LDAP_DEFS="$LDAP_DEFS -DNO_CACHE" + cat >> confdefs.h <<\EOF +#define LDAP_NOCACHE 1 +EOF + fi if test $ol_enable_dns != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS" + cat >> confdefs.h <<\EOF +#define LDAP_DNS 1 +EOF + fi if test $ol_enable_referrals != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS" + cat >> confdefs.h <<\EOF +#define LDAP_REFERRALS 1 +EOF + fi if test $ol_enable_cldap != no ; then - LDAP_DEFS="$LDAP_DEFS -DCLDAP" + cat >> confdefs.h <<\EOF +#define LDAP_CONNECTIONLESS 1 +EOF + fi if test $ol_enable_aclgroup != no ; then @@ -6034,15 +6050,27 @@ if test $ol_enable_aclgroup != no ; then #define SLAPD_ACLGROUP 1 EOF - SLAPD_DEFS="$SLAPD_DEFS -DACLGROUP" +fi + +if test $ol_enable_crypt != no ; then + cat >> confdefs.h <<\EOF +#define SLAPD_CRYPT 1 +EOF + fi if test $ol_enable_md5 != no ; then - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_MD5" + cat >> confdefs.h <<\EOF +#define SLAPD_MD5 1 +EOF + fi if test $ol_enable_sha1 != no ; then - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1" + cat >> confdefs.h <<\EOF +#define SLAPD_SHA1 1 +EOF + fi if test $ol_enable_phonetic != no ; then @@ -6050,7 +6078,6 @@ if test $ol_enable_phonetic != no ; then #define SLAPD_PHONETIC 1 EOF - SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX" fi if test $ol_enable_rlookups != no ; then @@ -6058,25 +6085,33 @@ if test $ol_enable_rlookups != no ; then #define SLAPD_RLOOKUPS 1 EOF - SLAPD_DEFS="$SLAPD_DEFS -DREVERSE_LOOKUPS" fi if test $ol_link_ldbm != no ; then + cat >> confdefs.h <<\EOF +#define SLAPD_LDBM 1 +EOF + BUILD_SLAPD=yes BUILD_LDBM=yes - LDBM_DEFS="-DLDAP_LDBM $LDBM_DEFS" fi if test $ol_enable_passwd != no ; then + cat >> confdefs.h <<\EOF +#define SLAPD_PASSWD 1 +EOF + BUILD_SLAPD=yes BUILD_PASSWD=yes - SLAPD_DEFS="-DLDAP_PASSWD $SLAPD_DEFS" fi if test $ol_enable_shell != no ; then + cat >> confdefs.h <<\EOF +#define SLAPD_SHELL 1 +EOF + BUILD_SLAPD=yes BUILD_SHELL=yes - SLAPD_DEFS="-DLDAP_SHELL $SLAPD_DEFS" fi if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \ @@ -6096,15 +6131,6 @@ fi - - - - - - - - - @@ -6298,23 +6324,14 @@ s%@BUILD_LDBM@%$BUILD_LDBM%g s%@BUILD_PASSWD@%$BUILD_PASSWD%g s%@BUILD_SHELL@%$BUILD_SHELL%g s%@BUILD_SLURPD@%$BUILD_SLURPD%g -s%@LDAP_DEFS@%$LDAP_DEFS%g s%@LDAP_LIBS@%$LDAP_LIBS%g -s%@LDAPD_DEFS@%$LDAPD_DEFS%g s%@LDAPD_LIBS@%$LDAPD_LIBS%g -s%@SLAPD_DEFS@%$SLAPD_DEFS%g s%@SLAPD_LIBS@%$SLAPD_LIBS%g -s%@SLURPD_DEFS@%$SLURPD_DEFS%g s%@SLURPD_LIBS@%$SLURPD_LIBS%g -s%@LDBM_DEFS@%$LDBM_DEFS%g s%@LDBM_LIBS@%$LDBM_LIBS%g -s%@LTHREAD_DEFS@%$LTHREAD_DEFS%g s%@LTHREAD_LIBS@%$LTHREAD_LIBS%g -s%@LUTIL_DEFS@%$LUTIL_DEFS%g s%@LUTIL_LIBS@%$LUTIL_LIBS%g -s%@KRB_DEFS@%$KRB_DEFS%g s%@KRB_LIBS@%$KRB_LIBS%g -s%@TERMCAP_DEFS@%$TERMCAP_DEFS%g s%@TERMCAP_LIBS@%$TERMCAP_LIBS%g CEOF diff --git a/configure.in b/configure.in index c526ca696c..586fe693e3 100644 --- a/configure.in +++ b/configure.in @@ -164,20 +164,13 @@ fi AC_MSG_RESULT(done) ## Initialize vars -LDAP_DEFS= LDAP_LIBS= -LDBM_DEFS= LDBM_LIBS= -LTHREAD_DEFS= LTHREAD_LIBS= -LUTIL_DEFS= LUTIL_LIBS= -LDAPD_DEFS= LDAPD_LIBS= -SLAPD_DEFS= SLAPD_LIBS= -SLURPD_DEFS= SLURPD_LIBS= BUILD_LDAPD=no @@ -188,9 +181,7 @@ BUILD_LDBM=no BUILD_PASSWD=no BUILD_SHELL=no -KRB_DEFS= KRB_LIBS= -TERMCAP_DEFS= TERMCAP_LIBS= dnl ---------------------------------------------------------------- @@ -250,7 +241,6 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then AC_DEFINE(HAVE_KERBEROS) - KRB_DEFS="-DKERBEROS" KRB_LIBS="-lkrb4 -lkrb5 -ldes425" fi fi @@ -267,7 +257,6 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k4 ; then AC_DEFINE(HAVE_KERBEROS) - KRB_DEFS="-DKERBEROS" KRB_LIBS="-lkrb -ldes" fi fi @@ -282,10 +271,9 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then OL_POSIX_THREAD_VERSION if test $ol_cv_pthread_version = final ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DPOSIX_THREADS" + dnl AC_DEFINE(HAVE_PTHREADS_FINAL) elif test $ol_cv_pthread_version = draft4 ; then AC_DEFINE(HAVE_PTHREADS_D4) - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_MIT_PTHREADS" else AC_MSG_ERROR([unknown pthread version]) fi @@ -297,7 +285,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then if test $ol_cv_linux_threads = yes ; then AC_DEFINE(HAVE_LINUX_THREADS,1) - LTHREAD_DEFS="$LTHREAD_DEFS -DLINUX_THREADS" fi dnl Now the hard part, how to link @@ -350,7 +337,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then AC_CHECK_LIB(pthread, pthread_create, [ AC_DEFINE(HAVE_DCE) ol_link_threads=posix - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_DCE_THREADS" LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lmach -lexc -lc"],, if test $with_preemptive = auto ; then ol_with_preemptive=yes @@ -365,7 +351,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = posix ; then dnl save DEFS/LIBS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" - CPPFLAGS="$LTHREAD_DEFS $CPPFLAGS" LIBS="$LTHREAD_LIBS $LIBS" dnl All POSIX Thread (final) implementations should have @@ -461,8 +446,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = cthreads ; then AC_CHECK_LIB(lwp, cthread_fork, [have_cthreads=yes], [have_cthreads=no]) if test $have_cthreads = yes ; then - AC_DEFINE(HAVE_CTHREADS) - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_NEXT_CTHREADS" + AC_DEFINE(HAVE_MACH_CTHREADS) LTHREAD_LIBS="$LTHREAD_LIBS -llwp" fi fi @@ -477,7 +461,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then if test $have_lwp = yes ; then AC_DEFINE(HAVE_LWP) AC_DEFINE(HAVE_LWP_THR) - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS5_LWP" LTHREAD_LIBS="$LTHREAD_LIBS -llwp" fi fi @@ -489,7 +472,6 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then if test $have_lwp = yes ; then AC_DEFINE(HAVE_LWP) - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_SUNOS4_LWP" LTHREAD_LIBS="$LTHREAD_LIBS -llwp" if test $with_preemptive = auto ; then @@ -500,7 +482,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = lwp ; then fi if test $ol_with_preemptive = yes ; then - LTHREAD_DEFS="$LTHREAD_DEFS -DTHREAD_PREEMPTIVE" + AC_DEFINE(THREAD_PREEMPTIVE,1) fi if test $ol_with_threads = manual ; then @@ -528,7 +510,7 @@ if test $ol_link_threads = no ; then $ol_with_threads = no fi - LTHREAD_DEFS="-DNO_THREADS" + AC_DEFINE(NO_THREADS,1) LTHREAD_LIBS="" fi @@ -540,12 +522,10 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db2 ; then ol_link_ldbm=db2 ol_with_ldbm_api=db2 - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2" - if test $ol_with_ldbm_type = hash ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" + AC_DEFINE(LDBM_USE_DBHASH,1) else - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + AC_DEFINE(LDBM_USE_DBBTREE,1) fi dnl $ol_cv_lib_db2 should be yes or -ldb @@ -563,14 +543,10 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = db ; then ol_link_ldbm=db ol_with_ldbm_api=db - if test $ac_cv_header_db_185_h = yes ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DB2_COMPAT185" - fi - if test $ol_with_ldbm_type = hash ; then - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBHASH" + AC_DEFINE(LDBM_USE_DBHASH,1) else - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_DBBTREE" + AC_DEFINE(LDBM_USE_DBBTREE,1) fi dnl $ol_cv_lib_db should be yes or -ldb @@ -602,8 +578,6 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = gdbm ; then ol_link_ldbm=gdbm ol_with_ldbm_api=gdbm - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_GDBM" - if test $ol_cv_lib_gdbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_gdbm" fi @@ -621,8 +595,6 @@ if test $ol_with_ldbm_api = auto -o $ol_with_ldbm_api = ndbm ; then AC_WARN([Attempting to use NDBM. Functionality will be limited.]) fi - LDBM_DEFS="$LDBM_DEFS -DLDBM_USE_NDBM" - if test $ol_cv_lib_ndbm != yes ; then LDBM_LIBS="$LDBM_LIBS $ol_cv_lib_ndbm" fi @@ -644,8 +616,7 @@ if test $ol_enable_wrappers = yes ; then [have_wrappers=yes], [have_wrappers=no]) if test $have_wrappers = yes ; then -dnl AC_DEFINE(HAVE_TCPD) - SLAPD_DEFS="$SLAPD_DEFS -DTCP_WRAPPERS" + AC_DEFINE(HAVE_TCPD) SLAPD_LIBS="$SLAPD_LIBS -lwrap" else AC_MSG_WARN(could not find -lwrap) @@ -682,7 +653,7 @@ if test $ol_link_termcap = no ; then fi if test $ol_link_termcap = no ; then - TERMCAP_DEFS="-DNOTERMCAP" + AC_DEFINE(NO_TERMCAP,1) TERMCAP_LIBS= fi @@ -693,8 +664,7 @@ if test $ol_enable_crypt != no ; then have_crypt=yes], [have_crypt=no])]) if test $have_crypt = yes ; then -dnl AC_DEFINE(HAVE_CRYPT) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_CRYPT" + AC_DEFINE(HAVE_CRYPT) else AC_MSG_WARN(could not find crypt) if test $ol_enable_crypt = yes ; then @@ -789,71 +759,67 @@ dnl ---------------------------------------------------------------- dnl Sort out defines if test $ol_enable_debug != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DEBUG" + AC_DEFINE(LDAP_DEBUG,1) fi dnl if test $ol_enable_syslog != no ; then -dnl LDAP_DEFS="$LDAP_DEFS -DLDAP_SYSLOG" +dnl AC_DEFINE(LDAP_SYSLOG,1) dnl fi if test $ol_enable_libui = yes ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_LIBUI" + AC_DEFINE(LDAP_LIBUI,1) fi if test $ol_enable_cache = no ; then - LDAP_DEFS="$LDAP_DEFS -DNO_CACHE" + AC_DEFINE(LDAP_NOCACHE,1) fi if test $ol_enable_dns != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_DNS" + AC_DEFINE(LDAP_DNS,1) fi if test $ol_enable_referrals != no ; then - LDAP_DEFS="$LDAP_DEFS -DLDAP_REFERRALS" + AC_DEFINE(LDAP_REFERRALS,1) fi if test $ol_enable_cldap != no ; then - LDAP_DEFS="$LDAP_DEFS -DCLDAP" + AC_DEFINE(LDAP_CONNECTIONLESS,1) fi if test $ol_enable_aclgroup != no ; then AC_DEFINE(SLAPD_ACLGROUP,1) - SLAPD_DEFS="$SLAPD_DEFS -DACLGROUP" +fi + +if test $ol_enable_crypt != no ; then + AC_DEFINE(SLAPD_CRYPT,1) fi if test $ol_enable_md5 != no ; then -dnl AC_DEFINE(SLAPD_MD5,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_MD5" + AC_DEFINE(SLAPD_MD5,1) fi if test $ol_enable_sha1 != no ; then -dnl AC_DEFINE(SLAPD_SHA1,1) - LUTIL_DEFS="$LUTIL_DEFS -DLDAP_SHA1" + AC_DEFINE(SLAPD_SHA1,1) fi if test $ol_enable_phonetic != no ; then AC_DEFINE(SLAPD_PHONETIC,1) - SLAPD_DEFS="$SLAPD_DEFS -DSOUNDEX" fi if test $ol_enable_rlookups != no ; then AC_DEFINE(SLAPD_RLOOKUPS,1) - SLAPD_DEFS="$SLAPD_DEFS -DREVERSE_LOOKUPS" fi if test $ol_link_ldbm != no ; then -dnl AC_DEFINE(SLAPD_LDBM,1) + AC_DEFINE(SLAPD_LDBM,1) BUILD_SLAPD=yes BUILD_LDBM=yes - LDBM_DEFS="-DLDAP_LDBM $LDBM_DEFS" fi if test $ol_enable_passwd != no ; then -dnl AC_DEFINE(SLAPD_PASSWD,1) + AC_DEFINE(SLAPD_PASSWD,1) BUILD_SLAPD=yes BUILD_PASSWD=yes - SLAPD_DEFS="-DLDAP_PASSWD $SLAPD_DEFS" fi if test $ol_enable_shell != no ; then -dnl AC_DEFINE(SLAPD_SHELL,1) + AC_DEFINE(SLAPD_SHELL,1) BUILD_SLAPD=yes BUILD_SHELL=yes - SLAPD_DEFS="-DLDAP_SHELL $SLAPD_DEFS" fi if test $ol_enable_slurpd != no -a $ol_link_threads != no -a \ @@ -871,24 +837,15 @@ AC_SUBST(BUILD_SLAPD) AC_SUBST(BUILD_SLURPD) -AC_SUBST(LDAP_DEFS) AC_SUBST(LDAP_LIBS) -AC_SUBST(LDAPD_DEFS) AC_SUBST(LDAPD_LIBS) -AC_SUBST(SLAPD_DEFS) AC_SUBST(SLAPD_LIBS) -AC_SUBST(SLURPD_DEFS) AC_SUBST(SLURPD_LIBS) -AC_SUBST(LDBM_DEFS) AC_SUBST(LDBM_LIBS) -AC_SUBST(LTHREAD_DEFS) AC_SUBST(LTHREAD_LIBS) -AC_SUBST(LUTIL_DEFS) AC_SUBST(LUTIL_LIBS) -AC_SUBST(KRB_DEFS) AC_SUBST(KRB_LIBS) -AC_SUBST(TERMCAP_DEFS) AC_SUBST(TERMCAP_LIBS) dnl ---------------------------------------------------------------- diff --git a/include/avl.h b/include/avl.h index 3281ef863e..1239a61238 100644 --- a/include/avl.h +++ b/include/avl.h @@ -21,6 +21,8 @@ * this structure represents a generic avl tree node. */ +LDAP_BEGIN_DECL + typedef struct avlnode { caddr_t avl_data; signed char avl_bf; @@ -76,4 +78,6 @@ avl_apply LDAP_P((Avlnode *, IFP, caddr_t, int, int)); /* what apply returns if it ran out of nodes */ #define AVL_NOMORE -6 +LDAP_END_DECL + #endif /* _AVL */ diff --git a/include/bridge.h b/include/bridge.h deleted file mode 100644 index e25dce3d97..0000000000 --- a/include/bridge.h +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (c) 1994 Regents of the University of Michigan. - * All rights reserved. - * - * Redistribution and use in source and binary forms are permitted - * provided that this notice is preserved and that due credit is given - * to the University of Michigan at Ann Arbor. The name of the University - * may not be used to endorse or promote products derived from this - * software without specific prior written permission. This software - * is provided ``as is'' without express or implied warranty. - */ - -/* This file SHOULD go away !!! */ - -#ifndef _LDAP_BRIDGE_H -#define _LDAP_BRIDGE_H - -/* - * portable.h for LDAP -- this is where we define common stuff to make - * life easier on various Unix systems. - * - * Unless you are porting LDAP to a new platform, you should not need to - * edit this file. - */ - -#ifndef LDAP_LIBUI -#ifndef NO_USERINTERFACE -#define NO_USERINTERFACE -#endif -#endif - -#ifndef SYSV -#if defined( hpux ) || defined( sunos5 ) || defined ( sgi ) || defined( SVR4 ) -# define SYSV -#endif -#endif - - -/* - * under System V, use sysconf() instead of getdtablesize - */ -#if defined( HAVE_SYSCONF ) && !defined( HAVE_GETDTABLESIZE ) -#define USE_SYSCONF -#endif - - -/* - * under System V, daemons should use setsid() instead of detaching from their - * tty themselves - */ -#if defined( HAVE_SETSID ) -#define USE_SETSID -#endif - - -/* - * System V has socket options in filio.h - */ -#if defined( HAVE_FILIO_H ) -#define NEED_FILIO -#endif - -/* - * use lockf() under System V - */ -#if !defined( HAVE_LOCKF ) && !defined( HAVE_FLOCK ) -#define USE_LOCKF -#endif - -/* - * on most systems, we should use waitpid() instead of waitN() - */ -#if defined( HAVE_WAITPID ) && !defined( nextstep ) -#define USE_WAITPID -#endif - - -/* - * define the wait status argument type - */ -#if !defined( WAITSTATUSTYPE ) -#if !defined( HAVE_SYS_WAIT_H ) -#define WAITSTATUSTYPE union wait -#else -#define WAITSTATUSTYPE int -#endif -#endif - -/* - * define the flags for wait - */ -#if !defined( WAIT_FLAGS ) -#ifdef sunos5 -#define WAIT_FLAGS ( WNOHANG | WUNTRACED | WCONTINUED ) -#else -#define WAIT_FLAGS ( WNOHANG | WUNTRACED ) -#endif -#endif - - -/* - * defined the options for openlog (syslog) - */ -#if !defined( OPENLOG_OPTIONS ) -#ifdef ultrix -#define OPENLOG_OPTIONS LOG_PID -#else -#define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) -#endif -#endif - - -/* - * many systems do not have the setpwfile() library routine... we just - * enable use for those systems we know have it. - */ -#ifdef NOTDEF -#ifndef HAVE_SETPWFILE -#if defined( sunos4 ) || defined( ultrix ) || defined( __osf__ ) -#define HAVE_SETPWFILE -#endif -#endif -#endif NOTDEF - -#ifndef DISABLE_BRIDGE -/* - * Are sys_errlist and sys_nerr declared in stdio.h? - */ -#ifndef SYSERRLIST_IN_STDIO -#if !defined( DECL_SYS_ERRLIST ) -#define SYSERRLIST_IN_STDIO -#endif -#endif - -/* - * for select() - */ -#if !defined(FD_SET) && !defined(WINSOCK) -#define NFDBITS 32 -#define FD_SETSIZE 32 -#define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS))) -#define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS))) -#define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS))) -#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p))) -#endif /* FD_SET */ -#endif - -#if defined( hpux ) && defined( __STDC__ ) -/* - * Under HP/UX, select seems to want (int *) instead of fd_set. Non-ANSI - * compilers don't like recursive macros, so ignore the problem if __STDC__ - * is not defined. - */ -#define select(a,b,c,d,e) select(a, (int *)b, (int *)c, (int *)d, e) -#endif /* hpux && __STDC__ */ - - -/* - * for signal() -- what do signal handling functions return? - */ -#ifdef RETSIGTYPE -#define SIG_FN RETSIGTYPE -#endif - - -/* - * call signal or sigset (signal does not block the signal while - * in the handler on sys v and sigset does not exist on bsd) - */ -#ifndef SIGNAL -#ifdef HAVE_SIGSET -#define SIGNAL sigset -#else -#define SIGNAL signal -#endif -#endif - -/* - * toupper and tolower macros are different under bsd and sys v - */ -#if defined( SYSV ) && !defined( hpux ) -#define TOUPPER(c) (isascii(c) && islower(c) ? _toupper(c) : c) -#define TOLOWER(c) (isascii(c) && isupper(c) ? _tolower(c) : c) -#else -#define TOUPPER(c) (isascii(c) && islower(c) ? toupper(c) : c) -#define TOLOWER(c) (isascii(c) && isupper(c) ? tolower(c) : c) -#endif - -/* - * put a cover on the tty-related ioctl calls we need to use - */ -#if !defined( HAVE_TERMIOS_H ) -#define TERMIO_TYPE struct sgttyb -#define TERMFLAG_TYPE int -#define GETATTR( fd, tiop ) ioctl((fd), TIOCGETP, (caddr_t)(tiop)) -#define SETATTR( fd, tiop ) ioctl((fd), TIOCSETP, (caddr_t)(tiop)) -#define GETFLAGS( tio ) (tio).sg_flags -#define SETFLAGS( tio, flags ) (tio).sg_flags = (flags) -#else -#define USE_TERMIOS -#define TERMIO_TYPE struct termios -#define TERMFLAG_TYPE tcflag_t -#define GETATTR( fd, tiop ) tcgetattr((fd), (tiop)) -#define SETATTR( fd, tiop ) tcsetattr((fd), TCSANOW /* 0 */, (tiop)) -#define GETFLAGS( tio ) (tio).c_lflag -#define SETFLAGS( tio, flags ) (tio).c_lflag = (flags) -#endif - - -#if defined( ultrix ) || defined( nextstep ) -extern char *strdup(); -#endif /* ultrix || nextstep */ - -#endif /* _LDAP_BRIDGE_H */ diff --git a/include/lber.h b/include/lber.h index c6a529e1d2..2617c86979 100644 --- a/include/lber.h +++ b/include/lber.h @@ -116,9 +116,7 @@ struct berval { char *bv_val; }; -#ifdef LDAP_DEBUG extern int lber_debug; -#endif /* * in bprint.c: @@ -148,10 +146,8 @@ LDAP_F unsigned long ber_scanf LDAP_P(( BerElement *ber, char *fmt, ... )); LDAP_F void ber_bvfree LDAP_P(( struct berval *bv )); LDAP_F void ber_bvecfree LDAP_P(( struct berval **bv )); LDAP_F struct berval *ber_bvdup LDAP_P(( struct berval *bv )); -#ifdef STR_TRANSLATION LDAP_F void ber_set_string_translators LDAP_P(( BerElement *ber, BERTranslateProc encode_proc, BERTranslateProc decode_proc )); -#endif /* STR_TRANSLATION */ /* * in encode.c @@ -170,12 +166,7 @@ LDAP_F int ber_start_seq LDAP_P(( BerElement *ber, unsigned long tag )); LDAP_F int ber_start_set LDAP_P(( BerElement *ber, unsigned long tag )); LDAP_F int ber_put_seq LDAP_P(( BerElement *ber )); LDAP_F int ber_put_set LDAP_P(( BerElement *ber )); - -#ifdef __STDC__ LDAP_F int ber_printf LDAP_P(( BerElement *ber, char *fmt, ... )); -#else -LDAP_F int ber_printf ( ); -#endif /* * in io.c: @@ -196,24 +187,6 @@ LDAP_F unsigned long ber_get_next LDAP_P(( Sockbuf *sb, unsigned long *len, LDAP_F void ber_init LDAP_P(( BerElement *ber, int options )); LDAP_F void ber_reset LDAP_P(( BerElement *ber, int was_writing )); -#if !defined(__alpha) || defined(VMS) - -#define LBER_HTONL( l ) htonl( l ) -#define LBER_NTOHL( l ) ntohl( l ) - -#else /* __alpha */ -/* - * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the - * lower-order 32-bits of a (64-bit) long, so we define correct versions - * here. - */ -#define LBER_HTONL( l ) (((long)htonl( (l) & 0x00000000FFFFFFFF )) << 32 \ - | htonl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) - -#define LBER_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \ - | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 )) -#endif /* __alpha */ - LDAP_END_DECL #endif /* _LBER_H */ diff --git a/include/ldap.h b/include/ldap.h index 1eab5bda62..c98bcf75e0 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -13,19 +13,9 @@ #ifndef _LDAP_H #define _LDAP_H -#ifdef __cplusplus -extern "C" { -#endif - +#include -#ifdef WINSOCK -#include "msdos.h" -#include -#endif - -#if !defined( NEEDPROTOS ) && defined(__STDC__) -#define NEEDPROTOS 1 -#endif +LDAP_BEGIN_DECL #define LDAP_PORT 389 #define LDAP_VERSION1 1 @@ -46,7 +36,8 @@ extern int ldap_debug; #ifdef LDAP_SYSLOG extern int ldap_syslog; extern int ldap_syslog_level; -#endif +#endif /* LDAP_SYSLOG */ + #define LDAP_DEBUG_TRACE 0x001 #define LDAP_DEBUG_PACKETS 0x002 #define LDAP_DEBUG_ARGS 0x004 @@ -61,6 +52,7 @@ extern int ldap_syslog_level; #define LDAP_DEBUG_PARSE 0x800 #define LDAP_DEBUG_ANY 0xffff +/* this doesn't below as part of ldap.h */ #ifdef LDAP_SYSLOG #define Debug( level, fmt, arg1, arg2, arg3 ) \ { \ @@ -221,6 +213,8 @@ typedef struct ldapmod { struct ldapmod *mod_next; } LDAPMod; +typedef struct timeval * LDAP_timeval_p; + /* * possible error codes we can return */ @@ -295,7 +289,7 @@ typedef struct ldapmsg { BerElement *lm_ber; /* the ber encoded message contents */ struct ldapmsg *lm_chain; /* for search - next msg in the resp */ struct ldapmsg *lm_next; /* next response */ - unsigned long lm_time; /* used to maintain cache */ + unsigned int lm_time; /* used to maintain cache */ } LDAPMessage; #define NULLMSG ((LDAPMessage *) NULL) @@ -318,7 +312,7 @@ typedef struct ldap_server { typedef struct ldap_conn { Sockbuf *lconn_sb; int lconn_refcnt; - unsigned long lconn_lastused; /* time */ + time_t lconn_lastused; /* time */ int lconn_status; #define LDAP_CONNST_NEEDSOCKET 1 #define LDAP_CONNST_CONNECTING 2 @@ -453,12 +447,8 @@ typedef struct ldap { int ld_cldaptimeout;/* time between retries */ int ld_refhoplimit; /* limit on referral nesting */ unsigned long ld_options; /* boolean options */ -#ifdef LDAP_DNS #define LDAP_OPT_DNS 0x00000001 /* use DN & DNS */ -#endif /* LDAP_DNS */ -#ifdef LDAP_REFERRALS #define LDAP_OPT_REFERRALS 0x00000002 /* chase referrals */ -#endif /* LDAP_REFERRALS */ #define LDAP_OPT_RESTART 0x00000004 /* restart if EINTR occurs */ /* do not mess with the rest though */ @@ -512,81 +502,259 @@ typedef struct ldap_url_desc { #define LDAP_URL_ERR_BADSCOPE 3 /* URL scope string is invalid */ #define LDAP_URL_ERR_MEM 4 /* can't allocate memory space */ +/* + * in abandon.c: + */ +LDAP_F int ldap_abandon LDAP_P(( LDAP *ld, int msgid )); -#ifndef NEEDPROTOS -extern LDAP *ldap_open(); -extern LDAP *ldap_init(); -#ifdef STR_TRANSLATION -extern void ldap_set_string_translators(); -#ifdef LDAP_CHARSET_8859 -extern int ldap_t61_to_8859(); -extern int ldap_8859_to_t61(); -#endif /* LDAP_CHARSET_8859 */ -#endif /* STR_TRANSLATION */ -extern LDAPMessage *ldap_first_entry(); -extern LDAPMessage *ldap_next_entry(); -extern char *ldap_get_dn(); -extern char *ldap_dn2ufn(); -extern char **ldap_explode_dn(); -extern char *ldap_first_attribute(); -extern char *ldap_next_attribute(); -extern char **ldap_get_values(); -extern struct berval **ldap_get_values_len(); -extern void ldap_value_free(); -extern void ldap_value_free_len(); -extern int ldap_count_values(); -extern int ldap_count_values_len(); -extern char *ldap_err2string(); -extern void ldap_getfilter_free(); -extern LDAPFiltDesc *ldap_init_getfilter(); -extern LDAPFiltDesc *ldap_init_getfilter_buf(); -extern LDAPFiltInfo *ldap_getfirstfilter(); -extern LDAPFiltInfo *ldap_getnextfilter(); -extern void ldap_setfilteraffixes(); -extern void ldap_build_filter(); -extern void ldap_flush_cache(); -extern void ldap_set_cache_options(); -extern void ldap_uncache_entry(); -extern void ldap_uncache_request(); -extern char *ldap_friendly_name(); -extern void ldap_free_friendlymap(); -extern LDAP *cldap_open(); -extern void cldap_setretryinfo(); -extern void cldap_close(); -extern LDAPFiltDesc *ldap_ufn_setfilter(); -extern int ldap_ufn_timeout(); -extern int ldap_sort_entries(); -extern int ldap_sort_values(); -extern int ldap_sort_strcasecmp(); -void ldap_free_urldesc(); -void ldap_set_rebind_proc(); -void ldap_enable_translation(); - - -#if defined(ultrix) || defined(VMS) || defined( nextstep ) -extern char *strdup(); -#endif +/* + * in add.c: + */ +LDAP_F int ldap_add LDAP_P(( LDAP *ld, char *dn, LDAPMod **attrs )); +LDAP_F int ldap_add_s LDAP_P(( LDAP *ld, char *dn, LDAPMod **attrs )); -#else /* NEEDPROTOS */ -#if !defined(MACOS) && !defined(DOS) && !defined(_WIN32) && !defined(WINSOCK) -#include -#endif -#if defined(WINSOCK) -#include "proto-ld.h" -#else -#include "proto-ldap.h" -#endif +/* + * in bind.c: + */ +LDAP_F int ldap_bind LDAP_P(( LDAP *ld, char *who, char *passwd, int authmethod )); +LDAP_F int ldap_bind_s LDAP_P(( LDAP *ld, char *who, char *cred, int method )); +LDAP_F void ldap_set_rebind_proc LDAP_P(( LDAP *ld, + int (*rebindproc) LDAP_P(( LDAP *ld, char **dnp, char **passwdp, int *authmethodp, int freeit )) +)); -#ifdef VMS -extern char *strdup( const char *s ); -#endif -#if defined(ultrix) || defined( nextstep ) -extern char *strdup(); -#endif +/* + * in sbind.c: + */ +LDAP_F int ldap_simple_bind LDAP_P(( LDAP *ld, char *who, char *passwd )); +LDAP_F int ldap_simple_bind_s LDAP_P(( LDAP *ld, char *who, char *passwd )); -#endif /* NEEDPROTOS */ +/* + * in kbind.c: + */ +LDAP_F int ldap_kerberos_bind_s LDAP_P(( LDAP *ld, char *who )); +LDAP_F int ldap_kerberos_bind1 LDAP_P(( LDAP *ld, char *who )); +LDAP_F int ldap_kerberos_bind1_s LDAP_P(( LDAP *ld, char *who )); +LDAP_F int ldap_kerberos_bind2 LDAP_P(( LDAP *ld, char *who )); +LDAP_F int ldap_kerberos_bind2_s LDAP_P(( LDAP *ld, char *who )); + + +/* + * in cache.c + */ +LDAP_F int ldap_enable_cache LDAP_P(( LDAP *ld, long timeout, long maxmem )); +LDAP_F void ldap_disable_cache LDAP_P(( LDAP *ld )); +LDAP_F void ldap_set_cache_options LDAP_P(( LDAP *ld, unsigned long opts )); +LDAP_F void ldap_destroy_cache LDAP_P(( LDAP *ld )); +LDAP_F void ldap_flush_cache LDAP_P(( LDAP *ld )); +LDAP_F void ldap_uncache_entry LDAP_P(( LDAP *ld, char *dn )); +LDAP_F void ldap_uncache_request LDAP_P(( LDAP *ld, int msgid )); + +/* + * in compare.c: + */ +LDAP_F int ldap_compare LDAP_P(( LDAP *ld, char *dn, char *attr, char *value )); +LDAP_F int ldap_compare_s LDAP_P(( LDAP *ld, char *dn, char *attr, char *value )); + +/* + * in delete.c: + */ +LDAP_F int ldap_delete LDAP_P(( LDAP *ld, char *dn )); +LDAP_F int ldap_delete_s LDAP_P(( LDAP *ld, char *dn )); + +/* + * in error.c: + */ +LDAP_F int ldap_result2error LDAP_P(( LDAP *ld, LDAPMessage *r, int freeit )); +LDAP_F char *ldap_err2string LDAP_P(( int err )); +LDAP_F void ldap_perror LDAP_P(( LDAP *ld, char *s )); + +/* + * in modify.c: + */ +LDAP_F int ldap_modify LDAP_P(( LDAP *ld, char *dn, LDAPMod **mods )); +LDAP_F int ldap_modify_s LDAP_P(( LDAP *ld, char *dn, LDAPMod **mods )); + +/* + * in modrdn.c: + */ +LDAP_F int ldap_modrdn LDAP_P(( LDAP *ld, char *dn, char *newrdn )); +LDAP_F int ldap_modrdn_s LDAP_P(( LDAP *ld, char *dn, char *newrdn )); +LDAP_F int ldap_modrdn2 LDAP_P(( LDAP *ld, char *dn, char *newrdn, + int deleteoldrdn )); +LDAP_F int ldap_modrdn2_s LDAP_P(( LDAP *ld, char *dn, char *newrdn, + int deleteoldrdn)); + +/* + * in open.c: + */ +LDAP_F LDAP *ldap_open LDAP_P(( char *host, int port )); +LDAP_F LDAP *ldap_init LDAP_P(( char *defhost, int defport )); + +/* + * in getentry.c: + */ +LDAP_F LDAPMessage *ldap_first_entry LDAP_P(( LDAP *ld, LDAPMessage *chain )); +LDAP_F LDAPMessage *ldap_next_entry LDAP_P(( LDAP *ld, LDAPMessage *entry )); +LDAP_F int ldap_count_entries LDAP_P(( LDAP *ld, LDAPMessage *chain )); + +/* + * in addentry.c + */ +LDAP_F LDAPMessage *ldap_delete_result_entry LDAP_P(( LDAPMessage **list, + LDAPMessage *e )); +LDAP_F void ldap_add_result_entry LDAP_P(( LDAPMessage **list, LDAPMessage *e )); + +/* + * in getdn.c + */ +LDAP_F char *ldap_get_dn LDAP_P(( LDAP *ld, LDAPMessage *entry )); +LDAP_F char *ldap_dn2ufn LDAP_P(( char *dn )); +LDAP_F char **ldap_explode_dn LDAP_P(( char *dn, int notypes )); +LDAP_F char **ldap_explode_dns LDAP_P(( char *dn )); +LDAP_F int ldap_is_dns_dn LDAP_P(( char *dn )); + +/* + * in getattr.c + */ +LDAP_F char *ldap_first_attribute LDAP_P(( LDAP *ld, LDAPMessage *entry, + BerElement **ber )); +LDAP_F char *ldap_next_attribute LDAP_P(( LDAP *ld, LDAPMessage *entry, + BerElement *ber )); + +/* + * in getvalues.c + */ +LDAP_F char **ldap_get_values LDAP_P(( LDAP *ld, LDAPMessage *entry, char *target )); +LDAP_F struct berval **ldap_get_values_len LDAP_P(( LDAP *ld, LDAPMessage *entry, + char *target )); +LDAP_F int ldap_count_values LDAP_P(( char **vals )); +LDAP_F int ldap_count_values_len LDAP_P(( struct berval **vals )); +LDAP_F void ldap_value_free LDAP_P(( char **vals )); +LDAP_F void ldap_value_free_len LDAP_P(( struct berval **vals )); + +/* + * in result.c: + */ +LDAP_F int ldap_result LDAP_P(( LDAP *ld, int msgid, int all, + LDAP_timeval_p timeout, LDAPMessage **result )); +LDAP_F int ldap_msgfree LDAP_P(( LDAPMessage *lm )); +LDAP_F int ldap_msgdelete LDAP_P(( LDAP *ld, int msgid )); + +/* + * in search.c: + */ +LDAP_F int ldap_search LDAP_P(( LDAP *ld, char *base, int scope, char *filter, + char **attrs, int attrsonly )); +LDAP_F int ldap_search_s LDAP_P(( LDAP *ld, char *base, int scope, char *filter, + char **attrs, int attrsonly, LDAPMessage **res )); +LDAP_F int ldap_search_st LDAP_P(( LDAP *ld, char *base, int scope, char *filter, + char **attrs, int attrsonly, struct timeval *timeout, LDAPMessage **res )); + +/* + * in ufn.c + */ +LDAP_F int ldap_ufn_search_c LDAP_P(( LDAP *ld, char *ufn, char **attrs, + int attrsonly, LDAPMessage **res, int (*cancelproc)( void *cl ), + void *cancelparm )); +LDAP_F int ldap_ufn_search_ct LDAP_P(( LDAP *ld, char *ufn, char **attrs, + int attrsonly, LDAPMessage **res, int (*cancelproc)( void *cl ), + void *cancelparm, char *tag1, char *tag2, char *tag3 )); +LDAP_F int ldap_ufn_search_s LDAP_P(( LDAP *ld, char *ufn, char **attrs, + int attrsonly, LDAPMessage **res )); +LDAP_F LDAPFiltDesc *ldap_ufn_setfilter LDAP_P(( LDAP *ld, char *fname )); +LDAP_F void ldap_ufn_setprefix LDAP_P(( LDAP *ld, char *prefix )); +LDAP_F int ldap_ufn_timeout LDAP_P(( void *tvparam )); + + +/* + * in unbind.c + */ +LDAP_F int ldap_unbind LDAP_P(( LDAP *ld )); +LDAP_F int ldap_unbind_s LDAP_P(( LDAP *ld )); + + +/* + * in getfilter.c + */ +LDAP_F LDAPFiltDesc *ldap_init_getfilter LDAP_P(( char *fname )); +LDAP_F LDAPFiltDesc *ldap_init_getfilter_buf LDAP_P(( char *buf, long buflen )); +LDAP_F LDAPFiltInfo *ldap_getfirstfilter LDAP_P(( LDAPFiltDesc *lfdp, char *tagpat, + char *value )); +LDAP_F LDAPFiltInfo *ldap_getnextfilter LDAP_P(( LDAPFiltDesc *lfdp )); +LDAP_F void ldap_setfilteraffixes LDAP_P(( LDAPFiltDesc *lfdp, char *prefix, char *suffix )); +LDAP_F void ldap_build_filter LDAP_P(( char *buf, unsigned long buflen, + char *pattern, char *prefix, char *suffix, char *attr, + char *value, char **valwords )); + +/* + * in free.c + */ +LDAP_F void ldap_getfilter_free LDAP_P(( LDAPFiltDesc *lfdp )); +LDAP_F void ldap_mods_free LDAP_P(( LDAPMod **mods, int freemods )); + +/* + * in friendly.c + */ +LDAP_F char *ldap_friendly_name LDAP_P(( char *filename, char *uname, + FriendlyMap **map )); +LDAP_F void ldap_free_friendlymap LDAP_P(( FriendlyMap **map )); + + +/* + * in cldap.c + */ +LDAP_F LDAP *cldap_open LDAP_P(( char *host, int port )); +LDAP_F void cldap_close LDAP_P(( LDAP *ld )); +LDAP_F int cldap_search_s LDAP_P(( LDAP *ld, char *base, int scope, char *filter, + char **attrs, int attrsonly, LDAPMessage **res, char *logdn )); +LDAP_F void cldap_setretryinfo LDAP_P(( LDAP *ld, int tries, int timeout )); + + +/* + * in sort.c + */ +LDAP_F int ldap_sort_entries LDAP_P(( LDAP *ld, LDAPMessage **chain, char *attr, + int (*cmp)() )); +LDAP_F int ldap_sort_values LDAP_P(( LDAP *ld, char **vals, int (*cmp)() )); +LDAP_F int ldap_sort_strcasecmp LDAP_P(( char **a, char **b )); + + +/* + * in url.c + */ +LDAP_F int ldap_is_ldap_url LDAP_P(( char *url )); +LDAP_F int ldap_url_parse LDAP_P(( char *url, LDAPURLDesc **ludpp )); +LDAP_F void ldap_free_urldesc LDAP_P(( LDAPURLDesc *ludp )); +LDAP_F int ldap_url_search LDAP_P(( LDAP *ld, char *url, int attrsonly )); +LDAP_F int ldap_url_search_s LDAP_P(( LDAP *ld, char *url, int attrsonly, + LDAPMessage **res )); +LDAP_F int ldap_url_search_st LDAP_P(( LDAP *ld, char *url, int attrsonly, + struct timeval *timeout, LDAPMessage **res )); + + +/* + * in charset.c + */ +LDAP_F void ldap_set_string_translators LDAP_P(( LDAP *ld, + BERTranslateProc encode_proc, BERTranslateProc decode_proc )); +LDAP_F int ldap_translate_from_t61 LDAP_P(( LDAP *ld, char **bufp, + unsigned long *lenp, int free_input )); +LDAP_F int ldap_translate_to_t61 LDAP_P(( LDAP *ld, char **bufp, + unsigned long *lenp, int free_input )); +LDAP_F void ldap_enable_translation LDAP_P(( LDAP *ld, LDAPMessage *entry, + int enable )); + +LDAP_F int ldap_t61_to_8859 LDAP_P(( char **bufp, unsigned long *buflenp, + int free_input )); +LDAP_F int ldap_8859_to_t61 LDAP_P(( char **bufp, unsigned long *buflenp, + int free_input )); + + +/* + * in msdos/winsock/wsa.c + */ +LDAP_F void ldap_memfree LDAP_P(( void *p )); + +LDAP_END_DECL -#ifdef __cplusplus -} -#endif #endif /* _LDAP_H */ diff --git a/include/lthread_rdwr.h b/include/lthread_rdwr.h index 1c751f39a6..100e9b62d2 100644 --- a/include/lthread_rdwr.h +++ b/include/lthread_rdwr.h @@ -29,16 +29,16 @@ typedef void * pthread_rdwrattr_t; #define pthread_rdwrattr_default NULL; -int pthread_rdwr_init_np LDAP_P((pthread_rdwr_t *rdwrp, pthread_rdwrattr_t *attrp)); -int pthread_rdwr_rlock_np LDAP_P((pthread_rdwr_t *rdwrp)); -int pthread_rdwr_runlock_np LDAP_P((pthread_rdwr_t *rdwrp)); -int pthread_rdwr_wlock_np LDAP_P((pthread_rdwr_t *rdwrp)); -int pthread_rdwr_wunlock_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_init_np LDAP_P((pthread_rdwr_t *rdwrp, pthread_rdwrattr_t *attrp)); +LDAP_F int pthread_rdwr_rlock_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_runlock_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_wlock_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_wunlock_np LDAP_P((pthread_rdwr_t *rdwrp)); #ifdef LDAP_DEBUG -int pthread_rdwr_rchk_np LDAP_P((pthread_rdwr_t *rdwrp)); -int pthread_rdwr_wchk_np LDAP_P((pthread_rdwr_t *rdwrp)); -int pthread_rdwr_rwchk_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_rchk_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_wchk_np LDAP_P((pthread_rdwr_t *rdwrp)); +LDAP_F int pthread_rdwr_rwchk_np LDAP_P((pthread_rdwr_t *rdwrp)); #endif /* LDAP_DEBUG */ LDAP_END_DECL diff --git a/include/portable.h.bot b/include/portable.h.bot index 4a45b92795..26034fd832 100644 --- a/include/portable.h.bot +++ b/include/portable.h.bot @@ -3,7 +3,6 @@ # include #endif -#include "bridge.h" #include "ldap_cdefs.h" #endif /* _LDAP_PORTABLE_H */ diff --git a/include/portable.h.in b/include/portable.h.in index 808e9111bb..f68de6de3c 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -108,13 +108,13 @@ is provided ``as is'' without express or implied warranty. #undef DECL_SYS_ERRLIST /* define if you have berkeley db */ -#undef HAVE_BERKELEY_DB2 +#undef HAVE_BERKELEY_DB /* define if you have berkeley db2 */ #undef HAVE_BERKELEY_DB2 -/* define if you have Mach CThreads */ -#undef HAVE_CTHREADS +/* define if you have crypt */ +#undef HAVE_CRYPT /* define if you have DCE */ #undef HAVE_DCE @@ -140,6 +140,9 @@ is provided ``as is'' without express or implied warranty. /* define if you have NDBM */ #undef HAVE_NDBM +/* define if you have Mach CThreads */ +#undef HAVE_MACH_CTHREADS + /* define if you have a preemptive POSIX Threads implementation */ #undef HAVE_PREEMPTIVE_PTHREADS @@ -152,15 +155,69 @@ is provided ``as is'' without express or implied warranty. /* define if you have -ltermcap */ #undef HAVE_TERMCAP +/* define if you have -lwrap */ +#undef HAVE_TCPD + +/* define this for connectionless LDAP support */ +#undef LDAP_CONNECTIONLESS + +/* define this to add debugging code */ +#undef LDAP_DEBUG + +/* define this for LDAP DNS support */ +#undef LDAP_DNS + +/* define this to remove -lldap cache support */ +#undef LDAP_NOCACHE + +/* define this for LDAP referrals support */ +#undef LDAP_REFERRALS + +/* define this for LDAP User Interface support */ +#undef LDAP_LIBUI + /* define this for ACL Group support */ #undef SLAPD_ACLGROUPS -/* define this for Reverse Lookup support */ -#undef SLAPD_RLOOKUPS +/* define this for crypt(3) password support */ +#undef SLAPD_CRYPT + +/* define this to use SLAPD LDBM backend */ +#undef SLAPD_LDBM + +/* define this for MD5 password support */ +#undef SLAPD_MD5 + +/* define this to use SLAPD passwd backend */ +#undef SLAPD_PASSWD /* define this for phonetic support */ #undef SLAPD_PHONETIC +/* define this for Reverse Lookup support */ +#undef SLAPD_RLOOKUPS + +/* define this for SHA1 password support */ +#undef SLAPD_SHA1 + +/* define this to use SLAPD shell backend */ +#undef SLAPD_SHELL + +/* define this to use DBBTREE w/ LDBM backend */ +#undef LDBM_USE_DBBTREE + +/* define this to use DBHASH w/ LDBM backend */ +#undef LDBM_USE_DBHASH + +/* define this if you want no termcap support */ +#undef NO_TERMCAP + +/* define this if you want no thread support */ +#undef NO_THREADS + +/* define this if the thread package is preemptive */ +#undef THREAD_PREEMPTIVE + /* Define if you have the bcopy function. */ #undef HAVE_BCOPY @@ -363,7 +420,6 @@ is provided ``as is'' without express or implied warranty. # include #endif -#include "bridge.h" #include "ldap_cdefs.h" #endif /* _LDAP_PORTABLE_H */ diff --git a/include/proto-lber.h b/include/proto-lber.h deleted file mode 100644 index c84687200b..0000000000 --- a/include/proto-lber.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * lber-proto.h - * function prototypes for lber library - */ - -#ifdef LDAP_DEBUG -extern int lber_debug; -#endif - -#ifndef LDAPFUNCDECL -#ifdef _WIN32 -#define LDAPFUNCDECL __declspec( dllexport ) -#else /* _WIN32 */ -#define LDAPFUNCDECL -#endif /* _WIN32 */ -#endif /* LDAPFUNCDECL */ - -/* - * in bprint.c: - */ -LDAPFUNCDECL void lber_bprint( char *data, int len ); - -/* - * in decode.c: - */ -LDAPFUNCDECL unsigned long ber_get_tag( BerElement *ber ); -LDAPFUNCDECL unsigned long ber_skip_tag( BerElement *ber, unsigned long *len ); -LDAPFUNCDECL unsigned long ber_peek_tag( BerElement *ber, unsigned long *len ); -LDAPFUNCDECL unsigned long ber_get_int( BerElement *ber, long *num ); -LDAPFUNCDECL unsigned long ber_get_stringb( BerElement *ber, char *buf, - unsigned long *len ); -LDAPFUNCDECL unsigned long ber_get_stringa( BerElement *ber, char **buf ); -LDAPFUNCDECL unsigned long ber_get_stringal( BerElement *ber, struct berval **bv ); -LDAPFUNCDECL unsigned long ber_get_bitstringa( BerElement *ber, char **buf, - unsigned long *len ); -LDAPFUNCDECL unsigned long ber_get_null( BerElement *ber ); -LDAPFUNCDECL unsigned long ber_get_boolean( BerElement *ber, int *boolval ); -LDAPFUNCDECL unsigned long ber_first_element( BerElement *ber, unsigned long *len, - char **last ); -LDAPFUNCDECL unsigned long ber_next_element( BerElement *ber, unsigned long *len, - char *last ); -#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 ) -LDAPFUNCDECL unsigned long ber_scanf( BerElement *ber, char *fmt, ... ); -#else -LDAPFUNCDECL unsigned long ber_scanf(); -#endif -LDAPFUNCDECL void ber_bvfree( struct berval *bv ); -LDAPFUNCDECL void ber_bvecfree( struct berval **bv ); -LDAPFUNCDECL struct berval *ber_bvdup( struct berval *bv ); -#ifdef STR_TRANSLATION -LDAPFUNCDECL void ber_set_string_translators( BerElement *ber, - BERTranslateProc encode_proc, BERTranslateProc decode_proc ); -#endif /* STR_TRANSLATION */ - -/* - * in encode.c - */ -LDAPFUNCDECL int ber_put_enum( BerElement *ber, long num, unsigned long tag ); -LDAPFUNCDECL int ber_put_int( BerElement *ber, long num, unsigned long tag ); -LDAPFUNCDECL int ber_put_ostring( BerElement *ber, char *str, unsigned long len, - unsigned long tag ); -LDAPFUNCDECL int ber_put_string( BerElement *ber, char *str, unsigned long tag ); -LDAPFUNCDECL int ber_put_bitstring( BerElement *ber, char *str, - unsigned long bitlen, unsigned long tag ); -LDAPFUNCDECL int ber_put_null( BerElement *ber, unsigned long tag ); -LDAPFUNCDECL int ber_put_boolean( BerElement *ber, int boolval, - unsigned long tag ); -LDAPFUNCDECL int ber_start_seq( BerElement *ber, unsigned long tag ); -LDAPFUNCDECL int ber_start_set( BerElement *ber, unsigned long tag ); -LDAPFUNCDECL int ber_put_seq( BerElement *ber ); -LDAPFUNCDECL int ber_put_set( BerElement *ber ); -#if defined( MACOS ) || defined( BC31 ) || defined( _WIN32 ) -LDAPFUNCDECL int ber_printf( BerElement *ber, char *fmt, ... ); -#else -LDAPFUNCDECL int ber_printf(); -#endif - -/* - * in io.c: - */ -LDAPFUNCDECL long ber_read( BerElement *ber, char *buf, unsigned long len ); -LDAPFUNCDECL long ber_write( BerElement *ber, char *buf, unsigned long len, - int nosos ); -LDAPFUNCDECL void ber_free( BerElement *ber, int freebuf ); -LDAPFUNCDECL int ber_flush( Sockbuf *sb, BerElement *ber, int freeit ); -LDAPFUNCDECL BerElement *ber_alloc( void ); -LDAPFUNCDECL BerElement *der_alloc( void ); -LDAPFUNCDECL BerElement *ber_alloc_t( int options ); -LDAPFUNCDECL BerElement *ber_dup( BerElement *ber ); -LDAPFUNCDECL void ber_dump( BerElement *ber, int inout ); -LDAPFUNCDECL void ber_sos_dump( Seqorset *sos ); -LDAPFUNCDECL unsigned long ber_get_next( Sockbuf *sb, unsigned long *len, - BerElement *ber ); -LDAPFUNCDECL void ber_init( BerElement *ber, int options ); -LDAPFUNCDECL void ber_reset( BerElement *ber, int was_writing ); - -#ifdef NEEDGETOPT -/* - * in getopt.c - */ -int getopt( int nargc, char **nargv, char *ostr ); -#endif /* NEEDGETOPT */ diff --git a/include/proto-ldap.h b/include/proto-ldap.h deleted file mode 100644 index 971ab5b34e..0000000000 --- a/include/proto-ldap.h +++ /dev/null @@ -1,276 +0,0 @@ -/* - * proto-ldap.h - * function prototypes for ldap library - */ - - -#ifndef LDAPFUNCDECL -#ifdef _WIN32 -#define LDAPFUNCDECL __declspec( dllexport ) -#else /* _WIN32 */ -#define LDAPFUNCDECL -#endif /* _WIN32 */ -#endif /* LDAPFUNCDECL */ - - -/* - * in abandon.c: - */ -LDAPFUNCDECL int ldap_abandon( LDAP *ld, int msgid ); - -/* - * in add.c: - */ -LDAPFUNCDECL int ldap_add( LDAP *ld, char *dn, LDAPMod **attrs ); -LDAPFUNCDECL int ldap_add_s( LDAP *ld, char *dn, LDAPMod **attrs ); - -/* - * in bind.c: - */ -LDAPFUNCDECL int ldap_bind( LDAP *ld, char *who, char *passwd, int authmethod ); -LDAPFUNCDECL int ldap_bind_s( LDAP *ld, char *who, char *cred, int method ); -#ifdef LDAP_REFERRALS -LDAPFUNCDECL void ldap_set_rebind_proc( LDAP *ld, int (*rebindproc)( LDAP *ld, - char **dnp, char **passwdp, int *authmethodp, int freeit )); -#endif /* LDAP_REFERRALS */ - -/* - * in sbind.c: - */ -LDAPFUNCDECL int ldap_simple_bind( LDAP *ld, char *who, char *passwd ); -LDAPFUNCDECL int ldap_simple_bind_s( LDAP *ld, char *who, char *passwd ); - -/* - * in kbind.c: - */ -LDAPFUNCDECL int ldap_kerberos_bind_s( LDAP *ld, char *who ); -LDAPFUNCDECL int ldap_kerberos_bind1( LDAP *ld, char *who ); -LDAPFUNCDECL int ldap_kerberos_bind1_s( LDAP *ld, char *who ); -LDAPFUNCDECL int ldap_kerberos_bind2( LDAP *ld, char *who ); -LDAPFUNCDECL int ldap_kerberos_bind2_s( LDAP *ld, char *who ); - - -#ifndef NO_CACHE -/* - * in cache.c - */ -LDAPFUNCDECL int ldap_enable_cache( LDAP *ld, long timeout, long maxmem ); -LDAPFUNCDECL void ldap_disable_cache( LDAP *ld ); -LDAPFUNCDECL void ldap_set_cache_options( LDAP *ld, unsigned long opts ); -LDAPFUNCDECL void ldap_destroy_cache( LDAP *ld ); -LDAPFUNCDECL void ldap_flush_cache( LDAP *ld ); -LDAPFUNCDECL void ldap_uncache_entry( LDAP *ld, char *dn ); -LDAPFUNCDECL void ldap_uncache_request( LDAP *ld, int msgid ); -#endif /* !NO_CACHE */ - -/* - * in compare.c: - */ -LDAPFUNCDECL int ldap_compare( LDAP *ld, char *dn, char *attr, char *value ); -LDAPFUNCDECL int ldap_compare_s( LDAP *ld, char *dn, char *attr, char *value ); - -/* - * in delete.c: - */ -LDAPFUNCDECL int ldap_delete( LDAP *ld, char *dn ); -LDAPFUNCDECL int ldap_delete_s( LDAP *ld, char *dn ); - -/* - * in error.c: - */ -LDAPFUNCDECL int ldap_result2error( LDAP *ld, LDAPMessage *r, int freeit ); -LDAPFUNCDECL char *ldap_err2string( int err ); -LDAPFUNCDECL void ldap_perror( LDAP *ld, char *s ); - -/* - * in modify.c: - */ -LDAPFUNCDECL int ldap_modify( LDAP *ld, char *dn, LDAPMod **mods ); -LDAPFUNCDECL int ldap_modify_s( LDAP *ld, char *dn, LDAPMod **mods ); - -/* - * in modrdn.c: - */ -LDAPFUNCDECL int ldap_modrdn( LDAP *ld, char *dn, char *newrdn ); -LDAPFUNCDECL int ldap_modrdn_s( LDAP *ld, char *dn, char *newrdn ); -LDAPFUNCDECL int ldap_modrdn2( LDAP *ld, char *dn, char *newrdn, - int deleteoldrdn ); -LDAPFUNCDECL int ldap_modrdn2_s( LDAP *ld, char *dn, char *newrdn, - int deleteoldrdn); - -/* - * in open.c: - */ -LDAPFUNCDECL LDAP *ldap_open( char *host, int port ); -LDAPFUNCDECL LDAP *ldap_init( char *defhost, int defport ); - -/* - * in getentry.c: - */ -LDAPFUNCDECL LDAPMessage *ldap_first_entry( LDAP *ld, LDAPMessage *chain ); -LDAPFUNCDECL LDAPMessage *ldap_next_entry( LDAP *ld, LDAPMessage *entry ); -LDAPFUNCDECL int ldap_count_entries( LDAP *ld, LDAPMessage *chain ); - -/* - * in addentry.c - */ -LDAPFUNCDECL LDAPMessage *ldap_delete_result_entry( LDAPMessage **list, - LDAPMessage *e ); -LDAPFUNCDECL void ldap_add_result_entry( LDAPMessage **list, LDAPMessage *e ); - -/* - * in getdn.c - */ -LDAPFUNCDECL char *ldap_get_dn( LDAP *ld, LDAPMessage *entry ); -LDAPFUNCDECL char *ldap_dn2ufn( char *dn ); -LDAPFUNCDECL char **ldap_explode_dn( char *dn, int notypes ); -LDAPFUNCDECL char **ldap_explode_dns( char *dn ); -LDAPFUNCDECL int ldap_is_dns_dn( char *dn ); - -/* - * in getattr.c - */ -LDAPFUNCDECL char *ldap_first_attribute( LDAP *ld, LDAPMessage *entry, - BerElement **ber ); -LDAPFUNCDECL char *ldap_next_attribute( LDAP *ld, LDAPMessage *entry, - BerElement *ber ); - -/* - * in getvalues.c - */ -LDAPFUNCDECL char **ldap_get_values( LDAP *ld, LDAPMessage *entry, char *target ); -LDAPFUNCDECL struct berval **ldap_get_values_len( LDAP *ld, LDAPMessage *entry, - char *target ); -LDAPFUNCDECL int ldap_count_values( char **vals ); -LDAPFUNCDECL int ldap_count_values_len( struct berval **vals ); -LDAPFUNCDECL void ldap_value_free( char **vals ); -LDAPFUNCDECL void ldap_value_free_len( struct berval **vals ); - -/* - * in result.c: - */ -LDAPFUNCDECL int ldap_result( LDAP *ld, int msgid, int all, - struct timeval *timeout, LDAPMessage **result ); -LDAPFUNCDECL int ldap_msgfree( LDAPMessage *lm ); -LDAPFUNCDECL int ldap_msgdelete( LDAP *ld, int msgid ); - -/* - * in search.c: - */ -LDAPFUNCDECL int ldap_search( LDAP *ld, char *base, int scope, char *filter, - char **attrs, int attrsonly ); -LDAPFUNCDECL int ldap_search_s( LDAP *ld, char *base, int scope, char *filter, - char **attrs, int attrsonly, LDAPMessage **res ); -LDAPFUNCDECL int ldap_search_st( LDAP *ld, char *base, int scope, char *filter, - char **attrs, int attrsonly, struct timeval *timeout, LDAPMessage **res ); - -/* - * in ufn.c - */ -LDAPFUNCDECL int ldap_ufn_search_c( LDAP *ld, char *ufn, char **attrs, - int attrsonly, LDAPMessage **res, int (*cancelproc)( void *cl ), - void *cancelparm ); -LDAPFUNCDECL int ldap_ufn_search_ct( LDAP *ld, char *ufn, char **attrs, - int attrsonly, LDAPMessage **res, int (*cancelproc)( void *cl ), - void *cancelparm, char *tag1, char *tag2, char *tag3 ); -LDAPFUNCDECL int ldap_ufn_search_s( LDAP *ld, char *ufn, char **attrs, - int attrsonly, LDAPMessage **res ); -LDAPFUNCDECL LDAPFiltDesc *ldap_ufn_setfilter( LDAP *ld, char *fname ); -LDAPFUNCDECL void ldap_ufn_setprefix( LDAP *ld, char *prefix ); -LDAPFUNCDECL int ldap_ufn_timeout( void *tvparam ); - - -/* - * in unbind.c - */ -LDAPFUNCDECL int ldap_unbind( LDAP *ld ); -LDAPFUNCDECL int ldap_unbind_s( LDAP *ld ); - - -/* - * in getfilter.c - */ -LDAPFUNCDECL LDAPFiltDesc *ldap_init_getfilter( char *fname ); -LDAPFUNCDECL LDAPFiltDesc *ldap_init_getfilter_buf( char *buf, long buflen ); -LDAPFUNCDECL LDAPFiltInfo *ldap_getfirstfilter( LDAPFiltDesc *lfdp, char *tagpat, - char *value ); -LDAPFUNCDECL LDAPFiltInfo *ldap_getnextfilter( LDAPFiltDesc *lfdp ); -LDAPFUNCDECL void ldap_setfilteraffixes( LDAPFiltDesc *lfdp, char *prefix, char *suffix ); -LDAPFUNCDECL void ldap_build_filter( char *buf, unsigned long buflen, - char *pattern, char *prefix, char *suffix, char *attr, - char *value, char **valwords ); - -/* - * in free.c - */ -LDAPFUNCDECL void ldap_getfilter_free( LDAPFiltDesc *lfdp ); -LDAPFUNCDECL void ldap_mods_free( LDAPMod **mods, int freemods ); - -/* - * in friendly.c - */ -LDAPFUNCDECL char *ldap_friendly_name( char *filename, char *uname, - FriendlyMap **map ); -LDAPFUNCDECL void ldap_free_friendlymap( FriendlyMap **map ); - - -/* - * in cldap.c - */ -LDAPFUNCDECL LDAP *cldap_open( char *host, int port ); -LDAPFUNCDECL void cldap_close( LDAP *ld ); -LDAPFUNCDECL int cldap_search_s( LDAP *ld, char *base, int scope, char *filter, - char **attrs, int attrsonly, LDAPMessage **res, char *logdn ); -LDAPFUNCDECL void cldap_setretryinfo( LDAP *ld, int tries, int timeout ); - - -/* - * in sort.c - */ -LDAPFUNCDECL int ldap_sort_entries( LDAP *ld, LDAPMessage **chain, char *attr, - int (*cmp)() ); -LDAPFUNCDECL int ldap_sort_values( LDAP *ld, char **vals, int (*cmp)() ); -LDAPFUNCDECL int ldap_sort_strcasecmp( char **a, char **b ); - - -/* - * in url.c - */ -LDAPFUNCDECL int ldap_is_ldap_url( char *url ); -LDAPFUNCDECL int ldap_url_parse( char *url, LDAPURLDesc **ludpp ); -LDAPFUNCDECL void ldap_free_urldesc( LDAPURLDesc *ludp ); -LDAPFUNCDECL int ldap_url_search( LDAP *ld, char *url, int attrsonly ); -LDAPFUNCDECL int ldap_url_search_s( LDAP *ld, char *url, int attrsonly, - LDAPMessage **res ); -LDAPFUNCDECL int ldap_url_search_st( LDAP *ld, char *url, int attrsonly, - struct timeval *timeout, LDAPMessage **res ); - - -/* - * in charset.c - */ -#ifdef STR_TRANSLATION -LDAPFUNCDECL void ldap_set_string_translators( LDAP *ld, - BERTranslateProc encode_proc, BERTranslateProc decode_proc ); -LDAPFUNCDECL int ldap_translate_from_t61( LDAP *ld, char **bufp, - unsigned long *lenp, int free_input ); -LDAPFUNCDECL int ldap_translate_to_t61( LDAP *ld, char **bufp, - unsigned long *lenp, int free_input ); -LDAPFUNCDECL void ldap_enable_translation( LDAP *ld, LDAPMessage *entry, - int enable ); - -#ifdef LDAP_CHARSET_8859 -LDAPFUNCDECL int ldap_t61_to_8859( char **bufp, unsigned long *buflenp, - int free_input ); -LDAPFUNCDECL int ldap_8859_to_t61( char **bufp, unsigned long *buflenp, - int free_input ); -#endif /* LDAP_CHARSET_8859 */ -#endif /* STR_TRANSLATION */ - - -#ifdef WINSOCK -/* - * in msdos/winsock/wsa.c - */ -LDAPFUNCDECL void ldap_memfree( void *p ); -#endif /* WINSOCK */ diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c index 08b47efd6b..adf62b805f 100644 --- a/libraries/libldap/url.c +++ b/libraries/libldap/url.c @@ -24,14 +24,13 @@ static char copyright[] = "@(#) Copyright (c) 1996 Regents of the University of #include #include #include +#include #ifdef MACOS -#include #include "macos.h" #endif /* MACOS */ #if defined( DOS ) || defined( _WIN32 ) -#include #include #include "msdos.h" #endif /* DOS || _WIN32 */ @@ -47,15 +46,9 @@ static char copyright[] = "@(#) Copyright (c) 1996 Regents of the University of #include "ldap-int.h" -#ifdef NEEDPROTOS -static int skip_url_prefix( char **urlp, int *enclosedp ); -static void hex_unescape( char *s ); -static int unhex( char c ); -#else /* NEEDPROTOS */ -static int skip_url_prefix(); -static void hex_unescape(); -static int unhex(); -#endif /* NEEDPROTOS */ +static int skip_url_prefix LDAP_P(( char **urlp, int *enclosedp )); +static void hex_unescape LDAP_P(( char *s )); +static int unhex LDAP_P(( char c )); int @@ -305,10 +298,10 @@ ldap_url_search( LDAP *ld, char *url, int attrsonly ) ber_free( ber, 1 ); } else { #ifdef LDAP_REFERRALS - err = send_server_request( ld, ber, ld->ld_msgid, NULL, srv, + err = ldap_send_server_request( ld, ber, ld->ld_msgid, NULL, srv, NULL, 1 ); #else /* LDAP_REFERRALS */ - err = send_initial_request( ld, LDAP_REQ_SEARCH, + err = ldap_send_initial_request( ld, LDAP_REQ_SEARCH, ludp->lud_dn, ber ); #endif /* LDAP_REFERRALS */ } diff --git a/libraries/libldbm/Makefile.in b/libraries/libldbm/Makefile.in index 34cead14cc..dd1c842bba 100644 --- a/libraries/libldbm/Makefile.in +++ b/libraries/libldbm/Makefile.in @@ -10,7 +10,6 @@ OBJS = ldbm.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XDEFS = @LDBM_DEFS@ XLIBS = @LDBM_LIBS@ -lavl testldbm: libldbm.a testldbm.o diff --git a/libraries/liblthread/Makefile.in b/libraries/liblthread/Makefile.in index bf75f2db02..a76fb6c315 100644 --- a/libraries/liblthread/Makefile.in +++ b/libraries/liblthread/Makefile.in @@ -10,7 +10,6 @@ OBJS = rdwr.o thread.o stack.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XDEFS = @LTHREAD_DEFS@ XLIBS = @LTHREAD_LIBS@ diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in index e4cd68314c..d5911abe54 100644 --- a/libraries/liblutil/Makefile.in +++ b/libraries/liblutil/Makefile.in @@ -9,4 +9,3 @@ OBJS = base64.o md5.o sha1.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -XDEFS = @LUTIL_DEFS@ diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in index 79610e878f..fc2db5a5cf 100644 --- a/servers/ldapd/Makefile.in +++ b/servers/ldapd/Makefile.in @@ -17,7 +17,6 @@ LDAP_LIBDIR= ../../libraries BUILD_OPT = "--enable-ldapd" BUILD_SRV = @BUILD_LDAPD@ -XDEFS= @LDAPD_DEFS@ XLIBS= @LDAPD_LIBS@ all-local: $(PROGRAMS) diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 2ac592aad6..c75bf99eb1 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -29,7 +29,6 @@ all-local: FORCE $(MAKE) $(MFLAGS) slapd (cd tools; $(MAKE) $(MFLAGS) all) -XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@ @LUTIL_DEFS@ XLIBS = @SLAPD_LIBS@ libbackends.a \ -lavl -llutil -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ @LUTIL_LIBS@ diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in index 00a29c73ce..0e2d15b61e 100644 --- a/servers/slapd/back-ldbm/Makefile.in +++ b/servers/slapd/back-ldbm/Makefile.in @@ -14,7 +14,6 @@ BUILD_OPT = "--enable-ldbm" BUILD_SRV = @BUILD_LDBM@ XINCPATH = -I.. -I$(srcdir)/.. -XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@ @LUTIL_DEFS@ PROGRAMS = libback-ldbm.a diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in index 577f50daf7..47b4a782fe 100644 --- a/servers/slapd/back-passwd/Makefile.in +++ b/servers/slapd/back-passwd/Makefile.in @@ -10,7 +10,6 @@ BUILD_SRV = @BUILD_PASSWD@ PROGRAMS= libback-passwd.a XINCPATH = -I.. -I$(srcdir)/.. -XDEFS = @LTHREAD_DEFS@ all-local: FORCE $(MAKE) $(MFLAGS) libback-passwd.a diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in index f3e1f3e53b..0ae8b98180 100644 --- a/servers/slapd/back-shell/Makefile.in +++ b/servers/slapd/back-shell/Makefile.in @@ -12,7 +12,6 @@ BUILD_SRV = @BUILD_SHELL@ PROGRAMS = libback-shell.a XINCPATH = -I.. -I$(srcdir)/.. -XDEFS = @LTHREAD_DEFS@ all-local: FORCE $(MAKE) $(MFLAGS) libback-shell.a diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in index 1bfc086302..7b76fb9346 100644 --- a/servers/slapd/tools/Makefile.in +++ b/servers/slapd/tools/Makefile.in @@ -44,7 +44,6 @@ build-ldbm: FORCE ldbm-tools: $(PROGRAMS) -XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@ XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ -llutil @LUTIL_LIBS@ build-edb2ldif: FORCE diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in index 591efe24a6..30940db12f 100644 --- a/servers/slurpd/Makefile.in +++ b/servers/slurpd/Makefile.in @@ -20,7 +20,6 @@ BUILD_SRV = @BUILD_SLURPD@ all-local: slurpd -XDEFS = @SLURPD_DEFS@ @LTHREAD_DEFS@ XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ slurpd: version.o -- 2.39.5