From 58ea169c92679eb5b0598c2420c95c626ccac27d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 30 Sep 1998 20:13:59 +0000 Subject: [PATCH] Minor fixes for Linux --- CHANGES | 577 ++----------------------------------- acconfig.h | 6 + clients/tools/ldapmodify.c | 32 +- clients/ud/util.c | 23 +- configure | 207 ++++++------- configure.in | 7 +- include/bridge.h | 2 +- include/lthread.h | 2 +- include/portable.h.in | 47 ++- 9 files changed, 211 insertions(+), 692 deletions(-) diff --git a/CHANGES b/CHANGES index 924b505e3e..1206b77ddc 100644 --- a/CHANGES +++ b/CHANGES @@ -1,545 +1,32 @@ -Changes since 3.3b1 - -Various Make-template files - update by doing 'make depend' - -include/disptmpl.h - add LDAP_DISP_OPT_HTMLBODYONLY option - -libraries/liblber/io.c - under MacOS, limit tcpwrite() calls to a - maximum of 64K bytes; ber_flush() int/long fix - -libraries/libldap/friendly.c - don't use errno on MacOS or DOS -libraries/libldap/regex.c - fix re_exec() to that ".*" matches "" -libraries/libldap/result.c - eliminate memory leak in wait4msg() -libraries/libldap/request.c - eliminate double-free impurity -libraries/libldap/tmplout.c - add LDAP_DISP_OPT_HTMLBODYONLY option -libraries/libldap/ufn.c - purify: avoid bad frees; plug memory leaks - -libraries/libldif/line64.c - str_parse_line() now 0-terminates base64 vals. - -libraries/macintosh/* - tcpwrite()/OpenTransport bug fixes - - better error checking for MacTCP driver opens - - don't use old routine names any more - -libraries/msdos/winsock/* - various bugs fixes & improvements - -servers/slapd/modify.c - fix bug causing unnormalized attr names -servers/slapd/monitor.c - return new "version" attribute -servers/slapd/regex.c - fix re_exec() to that ".*" matches "" -servers/slapd/tools/ldbmcat.c - make -n option work (don't open file "-n" ) -servers/slapd/tools/ldif2id2entry.c - include ids in stored entries -servers/slapd/schema.c - log some information useful in tracking - down schema-check problems -servers/slapd/dn.c - dn_upcase() was not returning anything (doh!) -servers/slapd/backend.c - pass unbind request to all backends -servers/slapd/unbind.c - pass unbind request to all backends -servers/slapd/Version.c - remove leading spaces from Versionstr[] - -servers/slapd/back-ldbm/unbind.c - make arguments consistent -servers/slapd/back-ldbm/bind.c - fix bug which allowed anyone to bind as - anyone else using kerberos, if there was - at least one krbName in an entry - -servers/slurpd/replog.c - do all replog copying with buffered i/o -servers/slurpd/fm.c - fix inconsistency in arguments -servers/slurpd/main.c - fix inconsistency in arguments - -clients/tools/ldapdelete.c - add -K flag - only does LDAP_AUTH_KRBV41 -clients/tools/ldapmodify.c - add -K flag - only does LDAP_AUTH_KRBV41 -clients/tools/ldapmodrdn.c - add -K flag - only does LDAP_AUTH_KRBV41 -clients/tools/ldapsearch.c - add -K flag - only does LDAP_AUTH_KRBV41 - -doc/man/man1/ldapdelete.1 - add -K flag - only does LDAP_AUTH_KRBV41 -doc/man/man1/ldapmodify.1 - add -K flag - only does LDAP_AUTH_KRBV41 -doc/man/man1/ldapmodrdn.1 - add -K flag - only does LDAP_AUTH_KRBV41 -doc/man/man1/ldapsearch.1 - add -K flag - only does LDAP_AUTH_KRBV41 -doc/man/man3/ldap_entry2text.3 - document LDAP_DISP_OPT_HTMLBODYONLY option -doc/man/man8/slapd.8 - add BUGS section and document modrdn bug - ----------------------------------------------------------------------------- -Changes since 3.2 - -Makefile - added support for IRIX (SGI) - - make depend improvements - -tests/ - all new test scripts -- make test - -include/lber.h - use short include file names #ifdef WINSOCK -include/ldap.h - change LDAPCache struct definition to reduce - cache overhead - - use short include file names #ifdef WINSOCK - - LDAP URL support - - add lr_conn to LDAPRequest (needed by abandon) - - add LDAP_OPT_RESTART for select() restart - - revised Debug() macro #ifdef WINSOCK -include/ldbm.h - under NDBM, use O_RDWR instead of O_CREAT - - in LDBM_WRCREAT and LDBM_NEWDB -include/proto-lber.h - changes for WIN32 -include/proto-ldap.h - changes for WIN32 - - added LDAP URL routines -include/disptmpl.h - changes for WIN32 -include/ldif.h - includes for new libldif library -include/srchpref.h - changes for WIN32 -libraries/liblber/decode.c - vararg changes for WIN32 -libraries/liblber/encode.c - vararg changes for WIN32 -libraries/libldap/abandon.c - make ldap_abandon() work with referrals -libraries/libldap/bind.c - added new ldap_set_rebind_proc() routine -libraries/libldap/cache.c - reduce cache overhead - - fix small cache size infinite loop bug - - clarify debugging messages -libraries/libldap/charset.c - new routines: ldap_translate_from_t61, - ldap_translate_to_t61, - ldap_enable_translation -libraries/libldap/cldap.c - changes to support referral re-bind w/auth -libraries/libldap/getfilter.c - ldap_build_filter: don't use NULL value -libraries/libldap/kbind.c - changes to support referral re-bind w/auth -libraries/libldap/ldap-int.h - changes to support referral re-bind w/auth - - rename do_select() to do_ldap_select() -libraries/libldap/open.c - changes to support referral re-bind w/auth - - ld_options = LDAP_OPT_REFERRALS by default -libraries/libldap/os-ip.c - include to fix HP/UX gcc builds - - rename do_select() to do_ldap_select() -libraries/libldap/result.c - wait4msg debugging now shows timeout values - - changes to support referral re-bind w/auth - - rename do_select() to do_ldap_select() - - buf fix in ldap_msgdelete() -- update prev - - support LDAP_OPT_RESTART option -libraries/libldap/request.c - changes to support referral re-bind w/auth - - initialize new lr_conn field (for abandon) -libraries/libldap/test.c - changes to support referral re-bind w/auth -libraries/libldap/tmplout.c - searchact uses "-dnt" and "-dnb", not "-dn" -libraries/libldap/url.c - new routines: ldap_is_ldap_url, - ldap_parse_url, ldap_url_search - ldap_url_search_s, ldap_url_search_st - -libraries/libldif/ - new library that contains line64 routines - -clients/tools/ldapmodify.c - preferred input format is now slapd.replog -clients/tools/ldapsearch.c - added -L option (output in LDIF format) - - don't print initial blank line when -f used - - support "-f -" for reading filters from stdin -clients/ud/*.c - various bug fixes & auth. streamlining - -doc/man/man3/ldap.3 - add several new routines -doc/man/man3/ldap_bind.3/.links - add new ldap_set_rebind_proc() routine -doc/man/man3/ldap_charset.3/.links - add new routines -doc/man/man3/ldap_disptmpl.3 - added missing *'s in ldap_init... arg. lists -doc/man/man3/ldap_result.3 - add details r.e. timeout parameter -doc/man/man3/ldap_open.3 - document LDAP_OPT_REFERRALS default to on -doc/man/man3/ldap_url.3/.links - document new LDAP URL routines - -Make-common.dist and .um - add LDBMINCLUDE variable - - use ISODEPACKAGE and ICRELEASE in place of - ICR1 and XTISODE defines - - remove LDAP_DNS stuff - -build/Make-append - add LDBMINCLUDE variable - - add NO_SETPROCTITLE to SERVERDEFS - - use ISODEPACKAGE and ICRELEASE in place of - ICR1 and XTISODE defines -build/mkdep - use compiler passed in, not always cc - - remove system dependencies when gcc is used -build/platforms/attsvr4-cc/ - AT&T SVR4 support -build/platforms/irix-cc/ - SGI IRIX support -build/platforms/irix-gcc/ - SGI IRIX support - -servers/ldapd/common.h - add missing extern function declarations -servers/ldapd/association.c - use ISODEPACKAGE test instead of ICR1, etc. -servers/ldapd/certificate.c - add missing extern declaration -servers/ldapd/error.c - use ISODEPACKAGE test instead of ICR1, etc. -servers/ldapd/kerberos.c - use ISODEPACKAGE test instead of ICR1, etc. -servers/ldapd/request.c - use ISODEPACKAGE test instead of ICR1, etc. -servers/ldapd/main.c - set proctitle to calling host (bug fix) - - CLDAP: don't timeout/exit prematurely -servers/ldapd/proctitle.c - don't compile file if NO_SETPROCTITLE is on -servers/ldapd/Make-template - don't try to make depend if don't have isode -servers/ldap - bug fixes, support ICR3 - -servers/slapd/tools/ldif.c - use correct pointer when calling realloc -servers/slapd/tools/edb2ldif.c - properly #ifdef code to handle potential - lack of file_attr_dir and turbo disk stuff - - add RDN attribute values to entries - - don't pre-pend './' to EDB files on cmd. line -servers/slapd/tools/ldapsyntax.c- use static buffer to speed things up -servers/slapd/tools/Make-template - don't try to make depend some tools - - if we don't have isode -servers/slapd - fix acl handling -servers/slapd - fix race condition setting o_dn -servers/slapd - bug fixes - -servers/slurpd - complete re-write - -tests/ - new - test scripts to verify basic - functionality of libraries, slapd, slurpd - ----------------------------------------------------------------------------- -Changes since 3.2b3 - -slapd admin guide - document ldbmtest changes - - clarify quick-start instructions - -include/ldapconfig.h.dist - move likely-to-change things to top - -Make-common.dist - add phonetic algorithm config lines -build/Make-append - add def for phonetic algorithm config lines - -libraries/libldbm/ldbm.c - fix bug with gdbm cache size handling - -libraries/liblber/encode.c - cap lengths at 32-bits for Alpha compatibility - -libraries/libldap/disptmpl.c - recognize both "addact" and "adddnact" -libraries/libldap/getdn.c - handle \ escapes in DNs better - -clients/tools/ldapsearch.c - added -S option to sort results - - print results as they are received (if no -S) - -servers/slapd/* - added function prototypes -servers/slapd/phonetic.c - make phonetic alg settable in Make-common -servers/slapd/tools/ldbmtest.c - fix bugs, use dbcache routines (like slapd) - - add 'b' and 'B' commands -servers/slapd/tools/edb2ldif.c - include quipu/config.h & quipu/entry.h - - this fixes TURBO_DISK problems -servers/ldapd/* - misc. fixes for VMS and OSF/1 - - added function prototypes - ----------------------------------------------------------------------------- -Changes since 3.2b2 - -servers/slapd/* - lots of changes/fixes/improvements -servers/slapd/tools/* - add ldif program - - add centipede program - - numerous fixes/improvements - -clients/tools/ldapmodify.c - add -b option (read binary vals from a file) - - add trailing \ feature for iattr, etc. -clients/tools/ldapsearch.c - add -z sizelimit and -l timelimit options - - add -B (allow non-ascii values_ option - - change /tmp template used with -t - -include/lber.h - add LBER_MAX_INCOMING_SIZE option - -libraries/liblber/io.c - support LBER_MAX_INCOMING_SIZE option - - new ber_init() and ber_reset() routines - -libraries/libldap/* - various improvements to LDAP_REFERRALS code - - minor changes for Mac re-port - -libraries/libldap/disptmpl.c - "addact" is now "adddnact" -libraries/libldap/cache.c - we now cache compare results that have error - of LDAP_NO_SUCH_ATTRIBUTE -libraries/libldap/open.c - support :port on ldap_open() hosts -libraries/libldap/charset.c - new T.61 to ISO-8859 conversion support - - thanks to enrique.silvestre@uv.es - -libraries/libldap/kbind.c - a few changes for MS Windows - -libraries/msdos/winsock/* - a few changes for Kerberos support - -servers/ldapd/modify.c - added support for JPEG non-file attrs. - - added support for octetstring attrs. - -servers/ldapd/syntax.c - DN syntax fixes (OID. and replace {ASN} w/#) - - don't escape '$' in DeliveryMethod attrs. - - added support for JPEG non-file attrs. - - added support for octetstring attrs. - ----------------------------------------------------------------------------- -Changes since 3.2b1 - -servers/slapd/ - add better database concurrency - - remove multiple dn support - - add stats logging - - fix syslogging - - add include config file option - - add dbcachesize option - - add abandon - - add lastmod/creator attrs - - add monitoring capability - - normalize dns properly - - base 64 value encoding support - - add schema checking - - fix various bugs - - add srvtab config option -servers/slapd/tools - whole new set of db creation/conversion tools - -clients/finger/main.c - added -c option & use of FINGER_RDNCOUNT -clients/gopher/go500.c - added -c option & use of GO500_RDNCOUNT -clients/gopher/go500gw.c - added -c option & use of GO500GW_RDNCOUNT - - removed non-functional -s option -clients/rcpt500/main.c - added -c option & use of RCPT500_RDNCOUNT -clients/rcpt500/query.c - use rdncount instead of hard-coded 2 - -include/ldapconfig.h.edit - added _RDNCOUNT #defines - -libraries/libldap/tmplout.c - made rdncount of 0 show all DN components - -libraries/libldap/getdn.c - added ldap_is_dns_dn() routine - -libraries/libldap/* - many #ifndef NO_REFERRALS changes - - new ldap_init() routine - ----------------------------------------------------------------------------- -Changes since 3.1 final - -General/various files - incorporated changes for Borland C 3.1 - -Makefile - added support for NeXTSTEP - -libraries/liblber/io.c - add ability to save ldap session to a file -include/lber.h - add ability to save ldap session to a file - - -build/platforms/nextstep-cc/Make-platform - - added -all_load option for ld -build/platforms/sunos5-cc/Make-platform - - define SYSEXITSPATH as for sunos5-gcc - -build/uname.sh - new replacement uname for NeXTSTEP, etc. - -clients/finger/main.c - don't use fprintf for entry2text -clients/gopher/go500.c - use GO500_HOSTNAME (bug fix) - - don't use fprintf for entry2text -clients/gopher/go500gw.c - use GO500GW_HOSTNAME (bug fix) - - don't use fprintf for entry2text -clients/mail500/main.c - improved error logging - - fixed "errors-to is a group" bug - - don't look in people space for groups - - don't bounce loop messages back to sender - - misc. fixes -clients/tools/ldapdelete.c - add -c option to continue after errors occur -clients/tools/ldapmodify.c - add -c option to continue after errors occur -clients/tools/ldapmodrdn.c - add -c option to continue after errors occur -clients/tools/ldapsearch.c - added -t option to write values to tmp files - - added -A option for "attributes only" -clients/ud/print.c - make sure ldap_count_values() returns > 0 - - before trying to use returned values - -doc/man/man1/ldapdelete.1 - updated to mention new -c option -doc/man/man1/ldapmodify.1 - updated to mention new -c option -doc/man/man1/ldapmodrdn.1 - updated to mention new -c option -doc/man/man1/ldapsearch.1 - updated to mention new -A & -t options -doc/man/man3/ldap_friendly.3 - fixed typo in ldap_free_friendlymap() -doc/man/man5/ldapfilter.conf.5 - add missing part of example config file - -include/disptmpl.h - appended 'L' to long #defined contants - - added entry2html family of routines -include/lber.h - added sb_options to allow copy to file - - added ber_wptr to re-start partial writes -include/ldap.h - added debug levels for sldapd - - added LDAP_SYSLOG to send debug using syslog -include/ldapconfig.h.edit - added GO500GW_HOSTNAME -include/ldapconfig.h.dist - added GO500GW_HOSTNAME -include/portable.h - select() macro fix for HP/UX /bin/cc -include/proto-lber.h - Borland C fixes - - added ber_bvdup() prototype -include/sysexits-compat.h - new file, in case we ever need it - -libraries/libavl/* - new library; used in sldapd -libraries/liblber/decode.c - new 'o' feature for ber_scanf() - - new ber_bvdup() routine - - Borland C fixes -libraries/liblber/encode.c - Borland C fixes -libraries/liblber/io.c - ensure that write size <= 64K under VMS - - use ber_wptr to restart partial writes - - added LBER_TO_FILE/FILE_ONLY option support -libraries/libldap/abandon.c - use correct message id in abandon requests -libraries/libldap/cache.c - use time() in a more portable manner -libraries/libldap/cldap.c - retry correct number of times (off by one) -libraries/libldap/error.c - define empty ldap_perror if NO_USERINTERFACE -libraries/libldap/getdn.c - ldap_dn2ufn() now returns dn if no '=' - - ldap_explode_dn handles DNs without '=' -libraries/libldap/open.c - "host" can now be a space-separated list -libraries/libldap/sort.c - make function declarations more portable -libraries/libldap/srchpref.c - fixed memory leak in options parsing -libraries/libldap/test.c - added -t & -T options for ber output to file - - added 'E' command to explode a DN -libraries/libldap/tmplout.c - added entry2html() - - added entry2html_search() - - added entry2vals() - - remove extraneous ber_free when not using tmpl - - fix non-ASCII core dump bugs -libraries/libldap/ldapfriendly - added EE & RU -libraries/libldap/ldapfilter.conf - - remove '\' inside [] in reg exprs. - - add web500gw to filter tags - - added xax500-auth section -libraries/libldap/ldapsearchprefs.conf - - changed xax500 tags -libraries/libldap/ldaptemplates.conf - - added co to Country template - - add missing types & options to comments - - add "Last Modified" attrs. to all templates - - make "Last Modified" attrs. read-only -libraries/libldbm/* - new library; used in sldapd -libraries/liblthread/* - new library; used in sldapd -libraries/msdos/README.WSA - updated to include Borland C instructions -libraries/vms/README.VMS - fixed pathname typo - -servers/ldapd/add.c - make BER tags unsigned long everywhere -servers/ldapd/certificate.c - make parsing consistent with printing code -servers/ldapd/main.c - moved openlog() after detach() call -servers/ldapd/modify.c - correct tag usage in ber_first/next loop - - output all debugging to stderr - - pass and use Sockbuf * in modify_result() call -servers/ldapd/result.c - change to always use DER encoding -servers/ldapd/search.c - change to always use DER encoding -servers/ldapd/syntax.c - add support for telexNumber -servers/sldapd - all new "standalone LDAP server" - - - ----------------------------------------------------------------------------- -Changes since 3.1b8 - -Make-common - added note r.e. -DNO_USERINTERFACE -servers/ldapd/association.c - don't include filio.h under AIX -build/platforms/aix-cc and -gcc - add _BSD to defines -include/portable.h - define OPENLOG_OPTIONS -clients/*/*.c - use OPENLOG_OPTIONS -servers/ldapd/main.c - use OPENLOG_OPTIONS -servers/ldapd/syntax.c - add iattr support (from craig watkins) - ----------------------------------------------------------------------------- -Changes since 3.1b7 - -Many System V portability fixes.... -A few fixes for VMS.... - -Makefile - support Linux & NetBSD -Make-common - add support for NEXOR version of isode - - add ISODEBASELIBS - -include/Make-template - make ldapconfig.h depend on Makefile -include/ldapconfig.h.edit - add RCPT500_LISTLIMIT, RCPT500_UFN - - add GO500_TIMEOUT, GO500_UFN - - add FINGER_UFN, FINGER_TIMEOUT, - - add GO500GW_UFN - - change *_DEREF to be LDAP_DEREF_FINDING -include/regex.h - use NEED_BSDREGEX -include/portable.h - SYSV changes & general re-vamping -include/disptmpl.h - fix typo in ldap_name2template() prototype - - add LDAP_SYN_RFC822ADDR - -libraries/liblber/io.c - make ber_alloc actually use BER - -libraries/libldap/cldap.c - preserve old log DN if NULL is passed -libraries/libldap/regex.c - use NEED_BSDREGEX -libraries/libldap/disptmpl.c - add support for LDAP_SYN_RFC822ADDR -libraries/libldap/tmplout.c - add support for LDAP_SYN_RFC822ADDR -libraries/libldap/getfilter.c - always #include "regex.h" - -servers/ldapd/main.c - don't check openlog return code -servers/ldapd/request.c - only do syslog if dosyslog is set -servers/ldapd/syntax.c - add support for user certificates (from ER) -servers/ldapd/certificate.c - add support for user certificates (new file) - -clients/finger/main.c - add -t disptmplfile option - - add -p port option - - add ufn support - -clients/gopher/go500.c - add -t disptmplfile option - - add ufn support - -clients/gopher/go500gw.c - add -t disptmplfile option - - add ufn support - -clients/mail500/main.c - add -t disptmplfile option - - add support for mail to -owner - -clients/rcpt500/main.c,query.c - add support for RCPT500_LISTLIMIT - - support -p ldapport option - - add ufn support - -clients/tools/ldapsearch.c - recognize -w option properly -clients/tools/ldapdelete.c - recognize -k option properly -clients/tools/ldapmodrdn.c - new program - -clients/ud/edit.c - use execlp() instead of execle() -clients/ud/main.c - include sys/ioctl.h under NetBSD -clients/ud/print.c - updated time2text() from libldap/tmplout.c - -contrib/saucer - new contributed client from Eric Rosenquist - -build/platforms - added netbsd-cc & netbsd-gcc - - updated sunos5-cc and sunos5-gcc - - added missing CC=gcc in hpux-gcc - - added vms -build/Make-append - change ISODELIBS - -doc/man/man8/rcpt500.8 - new manual page -doc/man/man3/ldap.3 - add (3) to routine names in INDEX section -doc/man/man3/ldap_search.3 - remove reference to ldap_parse(3) -doc/man/man3/ldap_modrdn.3 - new manual page -doc/man/man3/ldap_modrdn.3.links- new links file -doc/man/man3/ldap_disptmpl.3 - re-word ldap_octemplate description - - document LDAP_SYN_RFC822ADDR -doc/man/man5/ldap_searchprefs.5 - fix formatting -doc/man/man5/ldaptemplatesconf.5- document "mail" syntax type -doc/man/* - use ETCDIR everywhere (was %ETCDIR%) - - - -------- -ldap-3.1b7 CHANGES file - summary of major changes to each component -since the last release - -source tree - completely reorganized for your convenience - - makes full use of ansi-style prototypes - - supports non-ansi compilers through unproto utility - -configuration - all client configuration has been moved to ldapconfig.h.edit - (no need to edit multiple source code files) - -build procedure - completely revamped for your convenience - - automaticly figures out your platform/compiler - - supports multiple objects from a single source tree - -liblbdap - added support for display templates - - added support for search preferences - - added ldap_sort routines for sorting entries - - rearranged some routines/source files to allow - better incremental linking to reduce code bloat - - added support for CLDAP - -liblber - added O option to ber_scanf: allocate octet string w/length - - big tags (greater than 31) now supported - - distinguished encoding rules supported (runtime choice - between ber and der) - -in.xfingerd - now uses display template routines - - now uses ldap sorting routines - - editable configuration info moved to ldapconfig.h.edit - -go500 - now uses display template routines - - now uses ldap sorting routines - - editable configuration info moved to ldapconfig.h.edit - -go500gw - now uses display template routines - - now uses ldap sorting routines - - editable configuration info moved to ldapconfig.h.edit - -rcpt500 - now uses display template routines - - now uses ldap sorting routines - - editable configuration info moved to ldapconfig.h.edit - -mail500 - addition of a new "vacation" feature - - editable configuration info moved to ldapconfig.h.edit - -ldap tools - new addition of some shell-based tools - -whois++ g/w - moved to contrib/ directory - -web500 - new addition, in contrib/ directory - -ldapd - lots of bug fixes - - bring CLDAP code in line with latest Internet Draft - -documentation - library man pages have been completely re-done, split - into separate manuals, with new pages for each set of - routines. - - new man pages for most client programs (more on the way) - -windows ldap - support for Win32 (unfinished?) - - added VERSIONINFO resource to dll - - check for > 64K response packet and don't crash - -macintosh ldap - support Apple's new Universal Header files +OpenLDAP Change Log + +Changes included in OpenLDAP Stable + CVS Tag: OPENLDAP_STABLE + +Changes included in OpenLDAP Stable +CVS Tag: OPENLDAP_STABLE_980929 + Fixed gmake RUNDIR not defaulting problem. + +Changes included in OpenLDAP 1.0.1 +CVS Tag: OPENLDAP_STABLE_980907 + Added GNU Make Support + Added OpenBSD Support + Added FreeBSD 2.x vs 3.x detection + Fixed slapd LDAP_TCP_WRAPPER build problem + Fixed slapd NO_THREADS busy loop problem + Fixed slurpd NULL termination problem + Fixed misc build/install problems + Removed junked binary files from repository/distribution + +Changes included in OpenLDAP 1.0 +CVS Tag: OPENLDAP_1-0 + Added TCP Wrapper support to slapd + Added POSIX Threads (final) support + Added ACL enhancements including + Access by Groups + POSIX regex support + platform updates, and + numerous bug fixes and build changes. + +Base Version: University of Michigan LDAP v3.3 +CVS Tag: UMICH_3_3 diff --git a/acconfig.h b/acconfig.h index 00babca70b..cd0780d583 100644 --- a/acconfig.h +++ b/acconfig.h @@ -38,6 +38,9 @@ /* define if you have Sun LWP (Solaris style) */ #undef HAVE_LWP_THR +/* define if you have -lncurses */ +#undef HAVE_NCURSES + /* define if you have NDBM */ #undef HAVE_NDBM @@ -50,6 +53,9 @@ /* define if your POSIX Threads implementatin is circa Draft 4 */ #undef HAVE_PTHREADS_D4 +/* define if you have -ltermcap */ +#undef HAVE_TERMCAP + /* define this for connectionless LDAP support */ #undef LDAP_CONNECTIONLESS diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c index a6e3c0ab9e..31e770cdb3 100644 --- a/clients/tools/ldapmodify.c +++ b/clients/tools/ldapmodify.c @@ -53,28 +53,16 @@ extern int ldap_debug, lber_debug; #define T_DELETEOLDRDNSTR "deleteoldrdn" -#ifdef NEEDPROTOS -static int process_ldapmod_rec( char *rbuf ); -static int process_ldif_rec( char *rbuf ); -static void addmodifyop( LDAPMod ***pmodsp, int modop, char *attr, - char *value, int vlen ); -static int domodify( char *dn, LDAPMod **pmods, int newentry ); -static int dodelete( char *dn ); -static int domodrdn( char *dn, char *newrdn, int deleteoldrdn ); -static void freepmods( LDAPMod **pmods ); -static int fromfile( char *path, struct berval *bv ); -static char *read_one_record( FILE *fp ); -#else /* NEEDPROTOS */ -static int process_ldapmod_rec(); -static int process_ldif_rec(); -static void addmodifyop(); -static int domodify(); -static int dodelete(); -static int domodrdn(); -static void freepmods(); -static int fromfile(); -static char *read_one_record(); -#endif /* NEEDPROTOS */ +static int process_ldapmod_rec LDAP_P(( char *rbuf )); +static int process_ldif_rec LDAP_P(( char *rbuf )); +static void addmodifyop LDAP_P(( LDAPMod ***pmodsp, int modop, char *attr, + char *value, int vlen )); +static int domodify LDAP_P(( char *dn, LDAPMod **pmods, int newentry )); +static int dodelete LDAP_P(( char *dn )); +static int domodrdn LDAP_P(( char *dn, char *newrdn, int deleteoldrdn )); +static void freepmods LDAP_P(( LDAPMod **pmods )); +static int fromfile LDAP_P(( char *path, struct berval *bv )); +static char *read_one_record LDAP_P(( FILE *fp )); main( argc, argv ) diff --git a/clients/ud/util.c b/clients/ud/util.c index 2edb5aa265..0e6dda6ccc 100644 --- a/clients/ud/util.c +++ b/clients/ud/util.c @@ -10,21 +10,29 @@ * is provided ``as is'' without express or implied warranty. */ +#define DISABLE_BRIDGE +#include "portable.h" + #include +#include +#include #include -#include + #ifdef DOS #include #endif #include #if defined( NeXT ) -#include #endif #include +#include #include + #include #include + #include + #if !defined(DOS) && !defined( VMS) #include #endif @@ -34,6 +42,7 @@ #else /* USE_TERMIOS */ #include #endif /* USE_TERMIOS */ + #include "ud.h" #if defined(VMS) @@ -80,7 +89,7 @@ char *prompt; #endif /* * Stolen from the getpass() routine. Can't use the plain - * getpass() for two reasons. One is that X.500 passwords + * getpass() for two reasons. One is that LDAP passwords * can be really, really long - much longer than 8 chars. * The second is that we like to make this client available * out of inetd via a Merit asynch port, and we need to be @@ -226,8 +235,6 @@ FILE *where; fatal(s) char *s; { - void exit(); - if (errno != 0) perror(s); #ifdef KERBEROS @@ -594,13 +601,15 @@ unsigned int size; void Free(ptr) char *ptr; { - extern int free(); - +#ifndef STDC_HEADERS if (free(ptr) < 0) { perror("free"); exit(-1); /*NOTREACHED*/ } +#else + free(ptr); +#endif return; } diff --git a/configure b/configure index 6fa4693272..931c2eefe9 100755 --- a/configure +++ b/configure @@ -4427,22 +4427,21 @@ fi # ud needs termcap (should insert check here) ol_link_termcap=no - 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:4436: checking for $ac_hdr" >&5 +echo "configure:4435: 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:4446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4471,7 +4470,7 @@ done if test $ol_link_termcap = no ; then echo $ac_n "checking for tputs in -ltermcap""... $ac_c" 1>&6 -echo "configure:4475: checking for tputs in -ltermcap" >&5 +echo "configure:4474: 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 @@ -4479,7 +4478,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:4493: \"$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 @@ -4512,6 +4511,10 @@ have_termcap=no fi if test $have_termcap = yes ; then + cat >> confdefs.h <<\EOF +#define HAVE_TERMCAP 1 +EOF + ol_link_termcap=yes TERMCAP_LIBS=-ltermcap fi @@ -4519,7 +4522,7 @@ fi if test $ol_link_termcap = no ; then echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6 -echo "configure:4523: checking for initscr in -lncurses" >&5 +echo "configure:4526: 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 @@ -4527,7 +4530,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:4545: \"$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 @@ -4560,6 +4563,10 @@ have_ncurses=no fi if test $have_ncurses = yes ; then + cat >> confdefs.h <<\EOF +#define HAVE_NCURSES 1 +EOF + ol_link_termcap=yes TERMCAP_LIBS=-lncurses fi @@ -4573,12 +4580,12 @@ 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:4577: checking for crypt" >&5 +echo "configure:4584: 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:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_crypt=yes" else @@ -4620,7 +4627,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:4624: checking for crypt in -lcrypt" >&5 +echo "configure:4631: 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 @@ -4628,7 +4635,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:4650: \"$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 @@ -4678,12 +4685,12 @@ fi fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4682: checking for ANSI C header files" >&5 +echo "configure:4689: 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 @@ -4691,7 +4698,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4708,7 +4715,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 @@ -4726,7 +4733,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 @@ -4747,7 +4754,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4758,7 +4765,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:4762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -4786,12 +4793,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:4790: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4797: 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> @@ -4799,7 +4806,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4824,7 +4831,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:4828: checking for opendir in -ldir" >&5 +echo "configure:4835: 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 @@ -4832,7 +4839,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:4854: \"$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 @@ -4865,7 +4872,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4869: checking for opendir in -lx" >&5 +echo "configure:4876: 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 @@ -4873,7 +4880,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:4895: \"$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 @@ -4907,12 +4914,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:4911: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:4918: 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 @@ -4928,7 +4935,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:4932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -4959,23 +4966,23 @@ for ac_hdr in \ sys/ioctl.h \ sys/time.h \ syslog.h \ - termio.h \ + termios.h \ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4969: checking for $ac_hdr" >&5 +echo "configure:4976: 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:4979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4986: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5003,12 +5010,12 @@ done echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5007: checking for uid_t in sys/types.h" >&5 +echo "configure:5014: 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 @@ -5037,7 +5044,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:5041: checking type of array argument to getgroups" >&5 +echo "configure:5048: 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 @@ -5045,7 +5052,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:5081: \"$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 @@ -5084,7 +5091,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext < EOF @@ -5108,12 +5115,12 @@ EOF echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:5112: checking for mode_t" >&5 +echo "configure:5119: 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 @@ -5141,12 +5148,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5145: checking for off_t" >&5 +echo "configure:5152: 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 @@ -5174,12 +5181,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:5178: checking for pid_t" >&5 +echo "configure:5185: 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 @@ -5207,12 +5214,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:5211: checking return type of signal handlers" >&5 +echo "configure:5218: 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 @@ -5229,7 +5236,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -5248,12 +5255,12 @@ EOF echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5252: checking for size_t" >&5 +echo "configure:5259: 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 @@ -5281,12 +5288,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:5285: checking for uid_t in sys/types.h" >&5 +echo "configure:5292: 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 @@ -5315,12 +5322,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:5319: checking for st_blksize in struct stat" >&5 +echo "configure:5326: 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 @@ -5328,7 +5335,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:5332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -5349,12 +5356,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:5353: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:5360: 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 @@ -5363,7 +5370,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:5367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -5384,12 +5391,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:5388: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:5395: 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 @@ -5397,7 +5404,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:5401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -5419,12 +5426,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5423: checking for working const" >&5 +echo "configure:5430: 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:5484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5496,7 +5503,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:5500: checking for 8-bit clean memcmp" >&5 +echo "configure:5507: 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 @@ -5504,7 +5511,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:5525: \"$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 @@ -5532,12 +5539,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:5536: checking for strftime" >&5 +echo "configure:5543: 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:5571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_strftime=yes" else @@ -5582,7 +5589,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:5586: checking for strftime in -lintl" >&5 +echo "configure:5593: 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 @@ -5590,7 +5597,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:5612: \"$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 @@ -5628,12 +5635,12 @@ fi fi echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:5632: checking for vprintf" >&5 +echo "configure:5639: 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:5667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -5680,12 +5687,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:5684: checking for _doprnt" >&5 +echo "configure:5691: 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:5719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -5733,7 +5740,7 @@ fi fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:5737: checking for wait3 that fills in rusage" >&5 +echo "configure:5744: 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 @@ -5741,7 +5748,7 @@ else ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext < #include @@ -5772,7 +5779,7 @@ main() { } } EOF -if { (eval echo configure:5776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5783: \"$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 @@ -5822,12 +5829,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5826: checking for $ac_func" >&5 +echo "configure:5833: 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:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5878,12 +5885,12 @@ done for ac_func in strdup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5882: checking for $ac_func" >&5 +echo "configure:5889: 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:5917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5936,13 +5943,13 @@ done # Check Configuration echo $ac_n "checking declaration of sys_errlist""... $ac_c" 1>&6 -echo "configure:5940: checking declaration of sys_errlist" >&5 +echo "configure:5947: 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 < @@ -5952,7 +5959,7 @@ int main() { char *c = (char *) *sys_errlist ; return 0; } EOF -if { (eval echo configure:5956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ol_cv_dcl_sys_errlist=yes else @@ -5973,20 +5980,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:5977: checking existence of sys_errlist" >&5 +echo "configure:5984: 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:5990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ol_cv_have_sys_errlist=yes else diff --git a/configure.in b/configure.in index d1e012e9c3..c526ca696c 100644 --- a/configure.in +++ b/configure.in @@ -661,13 +661,12 @@ fi # ud needs termcap (should insert check here) ol_link_termcap=no - AC_CHECK_HEADERS(termcap.h ncurses.h) if test $ol_link_termcap = no ; then AC_CHECK_LIB(termcap, tputs, [have_termcap=yes], [have_termcap=no]) if test $have_termcap = yes ; then -dnl AC_DEFINE(HAVE_TERMCAP) + AC_DEFINE(HAVE_TERMCAP) ol_link_termcap=yes TERMCAP_LIBS=-ltermcap fi @@ -676,7 +675,7 @@ fi if test $ol_link_termcap = no ; then AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) if test $have_ncurses = yes ; then -dnl AC_DEFINE(HAVE_NCURSES) + AC_DEFINE(HAVE_NCURSES) ol_link_termcap=yes TERMCAP_LIBS=-lncurses fi @@ -723,7 +722,7 @@ AC_CHECK_HEADERS( \ sys/ioctl.h \ sys/time.h \ syslog.h \ - termio.h \ + termios.h \ unistd.h \ ) diff --git a/include/bridge.h b/include/bridge.h index 172fada4fc..e25dce3d97 100644 --- a/include/bridge.h +++ b/include/bridge.h @@ -189,7 +189,7 @@ /* * put a cover on the tty-related ioctl calls we need to use */ -#if !defined( HAVE_TERMIOS ) +#if !defined( HAVE_TERMIOS_H ) #define TERMIO_TYPE struct sgttyb #define TERMFLAG_TYPE int #define GETATTR( fd, tiop ) ioctl((fd), TIOCGETP, (caddr_t)(tiop)) diff --git a/include/lthread.h b/include/lthread.h index e9a4ee4f46..de2dd3497f 100644 --- a/include/lthread.h +++ b/include/lthread.h @@ -3,7 +3,7 @@ #ifndef _LTHREAD_H #define _LTHREAD_H -#include +#include "portable.h" LDAP_BEGIN_DECL diff --git a/include/portable.h.in b/include/portable.h.in index 324f8665a9..808e9111bb 100644 --- a/include/portable.h.in +++ b/include/portable.h.in @@ -1,15 +1,32 @@ /* include/portable.h.in. Generated automatically from configure.in by autoheader. */ /* - * 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. - */ +Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA +All rights reserved. + +Redistribution and use in source and binary forms are permitted only +as authorized by the OpenLDAP Public License. A copy of this +license is available at http://www.OpenLDAP.org/license.html or +in file LICENSE in the top-level directory of the distribution. + +This work is derived from the University of Michigan LDAP v3.3 +distribution. Information concerning is available at + http://www.umich.edu/~dirsvcs/ldap/ldap.html. + +This work also contains materials derived from public sources. + +--- + +Portions Copyright (c) 1992-1996 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. + +*/ #ifndef _LDAP_PORTABLE_H #define _LDAP_PORTABLE_H @@ -117,6 +134,9 @@ /* define if you have Sun LWP (Solaris style) */ #undef HAVE_LWP_THR +/* define if you have -lncurses */ +#undef HAVE_NCURSES + /* define if you have NDBM */ #undef HAVE_NDBM @@ -129,6 +149,9 @@ /* define if your POSIX Threads implementatin is circa Draft 4 */ #undef HAVE_PTHREADS_D4 +/* define if you have -ltermcap */ +#undef HAVE_TERMCAP + /* define this for ACL Group support */ #undef SLAPD_ACLGROUPS @@ -306,8 +329,8 @@ /* Define if you have the header file. */ #undef HAVE_TERMCAP_H -/* Define if you have the header file. */ -#undef HAVE_TERMIO_H +/* Define if you have the header file. */ +#undef HAVE_TERMIOS_H /* Define if you have the header file. */ #undef HAVE_THREAD_H -- 2.39.2