From d6efd6983109f85fcfda69c6e8eee8241d129c91 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 11 Aug 1998 02:30:35 +0000 Subject: [PATCH] Replace build templates and related files with Autoconf --- COPYRIGHT | 17 +- Make-common | 200 ----------- Makefile | 392 --------------------- Makefile.in | 6 + acconfig.h | 24 ++ aclocal.m4 | 29 ++ clients/Make-template | 84 ----- clients/fax500/Make-template | 87 ----- clients/finger/Make-template | 70 ---- clients/gopher/Make-template | 91 ----- clients/mail500/Make-template | 68 ---- clients/rcpt500/Make-template | 71 ---- clients/tools/Make-template | 118 ------- clients/ud/Make-template | 100 ------ configure.in | 111 ++++-- include/portable.h | 292 ++++++--------- libraries/Make-template | 86 ----- libraries/libavl/Make-template | 71 ---- libraries/liblber/Make-template | 85 ----- libraries/libldap/Make-template | 143 -------- libraries/libldbm/Make-template | 71 ---- libraries/libldif/Make-template | 69 ---- libraries/liblthread/Make-template | 69 ---- libraries/macintosh/Make-template | 48 --- libraries/msdos/Make-template | 48 --- libraries/vms/Make-template | 48 --- servers/Make-template | 88 ----- servers/ldapd/Make-template | 122 ------- servers/slapd/Make-template | 266 -------------- servers/slapd/back-ldbm/Make-template | 148 -------- servers/slapd/back-passwd/Make-template | 78 ---- servers/slapd/back-shell/Make-template | 113 ------ servers/slapd/repl.c | 2 +- servers/slapd/shell-backends/Make-template | 66 ---- servers/slapd/tools/Make-template | 219 ------------ servers/slapd/tools/ldif.c | 5 +- servers/slurpd/Make-template | 147 -------- servers/slurpd/fm.c | 4 +- servers/slurpd/ldap_op.c | 4 +- servers/slurpd/re.c | 2 + servers/slurpd/reject.c | 4 +- servers/slurpd/replog.c | 4 +- servers/slurpd/rq.c | 4 +- servers/slurpd/st.c | 7 +- 44 files changed, 285 insertions(+), 3496 deletions(-) delete mode 100644 Make-common delete mode 100644 Makefile create mode 100644 Makefile.in create mode 100644 acconfig.h create mode 100644 aclocal.m4 delete mode 100644 clients/Make-template delete mode 100644 clients/fax500/Make-template delete mode 100644 clients/finger/Make-template delete mode 100644 clients/gopher/Make-template delete mode 100644 clients/mail500/Make-template delete mode 100644 clients/rcpt500/Make-template delete mode 100644 clients/tools/Make-template delete mode 100644 clients/ud/Make-template delete mode 100644 libraries/Make-template delete mode 100644 libraries/libavl/Make-template delete mode 100644 libraries/liblber/Make-template delete mode 100644 libraries/libldap/Make-template delete mode 100644 libraries/libldbm/Make-template delete mode 100644 libraries/libldif/Make-template delete mode 100644 libraries/liblthread/Make-template delete mode 100644 libraries/macintosh/Make-template delete mode 100644 libraries/msdos/Make-template delete mode 100644 libraries/vms/Make-template delete mode 100644 servers/Make-template delete mode 100644 servers/ldapd/Make-template delete mode 100644 servers/slapd/Make-template delete mode 100644 servers/slapd/back-ldbm/Make-template delete mode 100644 servers/slapd/back-passwd/Make-template delete mode 100644 servers/slapd/back-shell/Make-template delete mode 100644 servers/slapd/shell-backends/Make-template delete mode 100644 servers/slapd/tools/Make-template delete mode 100644 servers/slurpd/Make-template diff --git a/COPYRIGHT b/COPYRIGHT index ea961e7c24..7abedc8c3b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,9 +1,16 @@ -Copyright (c) 1992-1996 Regents of the University of Michigan. +Copyright 1998 Net Boolean Incorporated 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. +to the authors. The name of the Net Boolean Incorporated 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 work is derived, in part, from University of Michigan LDAPv3.3. +Please see the file UM-Copyright for details. + +This work also contains patches and fixes from public sources +(primarily the Internet Community). + diff --git a/Make-common b/Make-common deleted file mode 100644 index 32683c7652..0000000000 --- a/Make-common +++ /dev/null @@ -1,200 +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. -# -# LDAP common Make defines (included in all but top-level Makefile) -# -#----------------------------------------------------------------------------- - -############################################################################# -## Edit the following variables to have appropriate values for your system ## -############################################################################# - -############################################################################# -## LDAP install paths ## -############################################################################# -# -# by default, everything is installed below INSTROOT -# servers, config files, etc. are put in ETCDIR -# include files get put in INCLUDEDIR -# libraries are put in LIBDIR -# man pages are put under MANDIR -# programs end-users will run are put in BINDIR -# -INSTROOT=/usr/local -ETCDIR= $(INSTROOT)/etc -INCLUDEDIR= $(INSTROOT)/include -LIBDIR= $(INSTROOT)/lib -MANDIR= $(INSTROOT)/man -BINDIR= $(INSTROOT)/bin -# -# if you want things to run in a different directory from where they -# are installed, set this accordingly (this path gets compiled into a -# few binaries). otherwise, leave it alone. -RUNTIMEETCDIR= $(ETCDIR) - -############################################################################# -## General compiler options ## -############################################################################# -# Passed to every compile (cc or gcc). This is where you put -O or -g, etc. -#EXTRACFLAGS=-g -# Passed to every link (ld). Include -g here if you did in EXTRACFLAGS. -#EXTRALDFLAGS=-g - -############################################################################# -## If you are NOT using Kerberos authentication, you can skip this section.## -############################################################################# -# -# Otherwise, to enable kerberos authentication, uncomment KERBEROS (and -# AFSKERBEROS if you are running the AFS version of kerberos). Also -# uncomment and change the various KRB* lines to point to where the -# kerberos libraries and include files are installed at your site. -# -#KERBEROS=-DKERBEROS -#AFSKERBEROS=-DAFSKERBEROS -#KRBINCLUDEFLAG = -I/usr/local/kerberos/include -#KRBLIBFLAG = -L/usr/local/kerberos/lib -#KRBLIBS = -lkrb -ldes - -############################################################################# -## ISODE is required ONLY to build the ldap <-> X.500 server (ldapd) ## -## If you don't want to build it, you can skip this section. ## -############################################################################# -# -# To build the ldap server, uncomment the HAVEISODE line, -# and the section describing build settings for your version of isode. -# -#HAVEISODE = yes -# If you compiled ISODE with TURBO_DISK defined, uncomment this -#ISODETURBOLIBS = -lgdbm -# uncomment these to have ldapd "pretty print" protocol elements w/debugging -#PEPSY_DUMP=-DPEPSY_DUMP -#PEPSY=/usr/local/ic/bin/pepsy -# uncommment this line to have ldapd load PP syntax handlers -# you'll also need to add -lpp to ISODEBASELIBS below -#LDAP_USE_PP=-DLDAP_USE_PP -# uncomment NO_SETPROCTITLE to have ldapd NOT change its title -#NO_SETPROCTITLE=-DNOSETPROCTITLE -# -# ISODE Consortium release build settings -# You should change the next line so that ICRELEASE matches the (integer) -# version number of whatever IC release you have, e.g. 1, 2, or 3 and -# also uncomment the next 5 lines. -#ICRELEASE=-DICRELEASE=1 -#ISODEPACKAGE=-DISODEPACKAGE=IC -#ISODEINCLUDEFLAG= -I/usr/local/ic/include/isode -I/usr/local/ic/include -#ISODELIBFLAG = -L/usr/local/ic/lib -#ISODEBASELIBS = -lisode -# -# Freely available ISODE 8.0 release build settings (uncomment the next 4 lines) -#ISODEPACKAGE=-DISODEPACKAGE -#ISODEINCLUDEFLAG= -I/usr/local/isode/include -#ISODELIBFLAG = -L/usr/local/isode/lib -#ISODEBASELIBS = -ldsap -lisode -# -# NEXOR ISODE release build settings (uncomment the next 4 lines) -#ISODEPACKAGE=-DISODEPACKAGE=XT -#ISODEINCLUDEFLAG= -I/usr/include/isode -#ISODELIBFLAG = -L/usr/local/lib -L/usr/sunlink/osi/lib -#ISODEBASELIBS = -lxtpp -lresolv -lxtdsap -lxtisode -losi - -############################################################################# -## If you don't want to run slapd, skip this section. ## -############################################################################# -# -# To build slapd (the stand-alone ldap daemon), uncomment the MAKESLAPD -# line and select the SLAPD_BACKENDS you want to use. If you enable the -# LDBM backend, also select one of the LDBM backends. -MAKESLAPD= yes -# -# remove the defines for backends you don't want to enable -SLAPD_BACKENDS= -DLDAP_LDBM -DLDAP_SHELL -DLDAP_PASSWD -# -# If you have included -DLDAP_LDBM in the SLAPD_BACKENDS line you need -# to specify which low-level database package to use. There are -# four choices: Berkeley db b-tree, Berkeley db hash, GNU dbm, or ndbm. -# -# berkeley db btree package -#LDBMBACKEND=-DLDBM_USE_DBBTREE -#LDBMINCLUDE=-I/usr/local/db/include -#LDBMLIB=-ldb -# berkeley db hash package -#LDBMBACKEND=-DLDBM_USE_DBHASH -#LDBMINCLUDE=-I/usr/local/db/include -#LDBMLIB=-ldb -# gnu dbm (gdbm) -#LDBMBACKEND=-DLDBM_USE_GDBM -#LDBMINCLUDE=-I/usr/local/gdbm/include -#LDBMLIB=-lgdbm -# standard unix ndbm -LDBMBACKEND=-DLDBM_USE_NDBM -# -# if you want to use a non-default threads package change these lines -#THREADS=-DNO_THREADS -#THREADSLIB= - -############################################################################# -## The following options are used by the xax500 client. If you haven't ## -## retrieved the xax500 source and dropped it into the "clients" ## -## directory, you can skip this section. ## -############################################################################# -# -# location of your X include files -#XINCLUDES= -I/usr/X11/include -# -# location of your X libraries -#XLIBDIRS=-L/usr/X11/lib -# -# include any extra X libraries you need here -# the following works with sunos 4 and X11R5 -#XLIBS = $(XLIBDIRS) -lXm -lXt -lX11 -# the following has been known to work with Solaris 2.4 and X11R6 -#XLIBS = $(XLIBDIRS) -lXm -lXext -lSM -lICE -lXpm -lXt -lX11 - -############################################################################# -## If you don't want to do auto-translation of character sets, skip this ## -############################################################################# -# -# Otherwise, uncomment this line and set the following options. -#STR_TRANSLATION=-DSTR_TRANSLATION -# -# remove the defines for LDAP client library T.61 character translation -# you do not need. If you use LDAP_CHARSET_8859, replace the '1' in "88591" -# with the number of the particular character set you use. E.g., use "88594" -# if you use the ISO 8859-4 chracter set. -#LIBLDAP_CHARSETS=-DLDAP_CHARSET_8859="88591" -# -# uncomment one these lines to enable automatic T.61 translation by default -#LIBLDAP_DEF_CHARSET=-DLDAP_DEFAULT_CHARSET=LDAP_CHARSET_8859 - -############################################################################# -## General options ## -############################################################################# -# uncomment this line to enable debugging code (a good idea) -LDAP_DEBUG=-DLDAP_DEBUG - -# uncomment this line to turn on a few U of Michigan specific things -#UOFM=-DUOFM - -# uncomment this line to delete a few printfs in the lber and ldap libraries. -#NO_USERINTERFACE=-DNO_USERINTERFACE - -# uncomment this line to include Connectionless LDAP support -#CLDAP=-DCLDAP - -# uncomment this line to eliminate local caching support in the libldap -#NO_CACHE=-DNO_CACHE - -# uncomment this line to enable support for LDAP referrals in libldap -LDAP_REFERRALS=-DLDAP_REFERRALS - -# uncomment this line to use soundex for approximate matches in slapd. -# the default is to use the metaphone algorithm. -#PHONETIC=-DSOUNDEX diff --git a/Makefile b/Makefile deleted file mode 100644 index a8103f2270..0000000000 --- a/Makefile +++ /dev/null @@ -1,392 +0,0 @@ -# -# You will usually NOT need to edit this file at all: instead, edit the -# Make-common file. See the LDAP INSTALL file for more information. -# -#----------------------------------------------------------------------------- -# 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. -# -# LDAP lightweight X.500 Directory access top level makefile -# -#----------------------------------------------------------------------------- -# -############################################################################ -# # -# Usually you will not need to edit anything in this file # -# # -############################################################################ -# -# Note that these definitions of standard Unix utilities are only used -# in this Makefile. The Make-common (and .make-platform) files have a -# similar set of definitions that are used in all the other LDAP Makefiles. -# -RM=rm -f -MV=mv -f -CP=cp -CAT=cat -PWD=pwd -TAIL=tail -CHMOD=chmod -FIND=find -SED=sed -LN=ln -s -MKDIR=mkdir -GREP=grep -DIRNAME=dirname -BASENAME=basename -TAR=tar -COMPRESS=compress -CO=co -CI=ci - - -SRCDIRS= include libraries clients servers doc -TESTDIR= tests - -# -# LDAPSRC is used by the links rule -# -LDAPSRC= .. - - -# -# rules to make the software -# - -all: makeconfig - @echo "making all" - @for i in $(SRCDIRS); do \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ - ( cd $$i; $(MAKE) $(MFLAGS) all ); \ - done - -lib-only: makeconfig - @echo "making libraries only" - @echo " cd include; $(MAKE) $(MFLAGS) all"; \ - cd include; $(MAKE) $(MFLAGS) all - @echo " cd libraries; $(MAKE) $(MFLAGS) all"; \ - cd libraries; $(MAKE) $(MFLAGS) all - - -# -# rules to install the software -# - -install: makeconfig - @for i in $(SRCDIRS); do \ - echo; echo "cd $$i; $(MAKE) $(MFLAGS) install"; \ - ( cd $$i; $(MAKE) $(MFLAGS) install ); \ - done - -inst-lib: makeconfig - @echo "cd libraries; $(MAKE) $(MFLAGS) install" - @( cd libraries; $(MAKE) $(MFLAGS) install ) - - -# -# rules to test the LDAP software -# -test: all - @echo " cd $(TESTDIR); $(MAKE) $(MFLAGS) all"; \ - ( cd $(TESTDIR); $(MAKE) $(MFLAGS) all ); - -# -# rules to make clean -# - -clean: FORCE - @if [ -f .makefiles ]; then \ - for i in $(SRCDIRS) $(TESTDIR); do \ - echo; echo "cd $$i; $(MAKE) $(MFLAGS) clean"; \ - ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ - done; \ - fi; \ - ( for d in ./obj-*; do \ - if [ $$d != "./obj-*" ]; then \ - ( echo "making clean in $$d..."; \ - cd $$d; $(MAKE) $(MFLAGS) clean; ) \ - else \ - exit 0; \ - fi; \ - done ) - -veryclean: FORCE - @echo; echo "cd build; $(MAKE) $(MFLAGS) -f Make-template veryclean"; \ - ( cd build; $(MAKE) $(MFLAGS) -f Make-template veryclean ); \ - if [ -f .makefiles ]; then \ - for i in $(SRCDIRS) $(TESTDIR); do \ - echo; echo "cd $$i; $(MAKE) $(MFLAGS) veryclean"; \ - ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \ - done; \ - echo "finding and removing Makefiles..."; \ - for i in `$(FIND) . -type d -print`; do \ - if [ -f $$i/Make-template ]; then \ - echo "removing file $$i/Makefile"; \ - $(RM) $$i/Makefile; \ - fi; \ - done; \ - echo "removing file .makefiles"; \ - $(RM) .makefiles; \ - fi; \ - ( for d in ./obj-*; do \ - if [ $$d != "./obj-*" ]; then \ - echo "removing $$d..."; $(RM) -r $$d; \ - else \ - exit 0; \ - fi; \ - done ); \ - if [ -f .make-platform ]; then \ - echo "removing link .make-platform"; \ - $(RM) .make-platform; \ - else \ - exit 0; \ - fi - - -# -# rules to make depend -# -# -depend: makeconfig - @echo "making depend everywhere"; \ - echo " cd include; $(MAKE) $(MFLAGS) all"; \ - ( cd include; $(MAKE) $(MFLAGS) all ); \ - for i in $(SRCDIRS); do \ - echo; echo "cd $$i; $(MAKE) $(MFLAGS) depend"; \ - ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ - done; \ - $(MAKE) $(MFLAGS) makefiles - -# -# rules to check out and in Make-template files -# -co-mktmpls: FORCE - @echo "checking out Make-template files..."; \ - for mkfile in `$(FIND) . -name Make-template -type f -print`; do \ - $(CO) -l $$mkfile; \ - done - -ci-mktmpls: FORCE - @echo "enter a one-word log message:"; \ - read logmsg; \ - echo "checking in Make-template files..."; \ - for mkfile in `$(FIND) . -name Make-template -type f -print`; do \ - $(CI) -m$$logmsg -u $$mkfile; \ - done - - -lib-depend: makeconfig - @echo "cd libraries; $(MAKE) $(MFLAGS) depend" - @( cd libraries; $(MAKE) $(MFLAGS) depend )" - -# -# rules to cut a new ldap distribution -# -distribution: makeconfig checkin tar - -checkin: FORCE - @-VERSION=V`cat ./build/version | $(SED) -e 's/\.//'` ; \ - echo "Checking in version $$VERSION"; \ - for i in `$(FIND) . -name \*,v -print | \ - $(SED) -e 's%RCS/%%' -e 's%,v%%'`; \ - do ( \ - ci -m"pre-version $$VERSION check-in" -u $$i; \ - rcs -N$$VERSION: $$i ) \ - done - -tar: veryclean - @PWD=`pwd`; \ - $(RM) ./Make-common; \ - $(CP) ./Make-common.dist ./Make-common; \ - $(CHMOD) 644 ./Make-common; \ - $(RM) ./include/ldapconfig.h.edit; \ - $(CP) ./include/ldapconfig.h.dist ./include/ldapconfig.h.edit; \ - $(CHMOD) 644 ./include/ldapconfig.h.edit; \ - BASE=`$(BASENAME) $$PWD`; XFILE=/tmp/ldap-x.$$$$; \ - ( cd .. ; $(CAT) $$BASE/exclude >$$XFILE; \ - $(FIND) $$BASE -name RCS -print >> $$XFILE ; \ - $(FIND) $$BASE -name obj-\* -print >> $$XFILE ; \ - $(FIND) $$BASE -name tags -print >> $$XFILE ; \ - $(TAR) cvfX ./$$BASE.tar $$XFILE $$BASE; \ - ); \ - $(RM) $$XFILE; \ - echo "compressing ../$$BASE.tar..."; \ - $(COMPRESS) ../$$BASE.tar - -# -# rule to force check for change of platform -# -platform: FORCE - @if [ -f .make-platform ]; then \ - echo "removing old link .make-platform"; \ - $(RM) .make-platform; \ - fi; \ - $(MAKE) $(MFLAGS) .make-platform - - -makeconfig: .makefiles buildtools - -.make-platform: - @if [ -f /usr/bin/swconfig ]; then \ - UNAME=./build/uname.sh; \ - elif [ -f /bin/uname ]; then \ - UNAME=/bin/uname; \ - elif [ -f /usr/bin/uname ]; then \ - UNAME=/usr/bin/uname; \ - else \ - UNAME=./build/uname.sh; \ - fi; \ - if [ -z "$$UNAME" ]; then \ - echo "unknown platform (no $$UNAME or /usr/bin/uname)"; \ - echo "see the file build/PORTS for more information."; \ - exit 1; \ - else \ - OS=`$$UNAME -s` ; OSRELEASE=`$$UNAME -r` ; \ - OSVERSION=`$$UNAME -v` ; \ - case $$OS in \ - SunOS) \ - if [ $$OSRELEASE -gt "5" -o $$OSRELEASE -lt "4" ]; then \ - echo "SunOS release $$OSRELEASE unknown..."; exit 1; \ - fi; \ - if [ $$OSRELEASE -ge "5" ]; then \ - PLATFORM="sunos5"; \ - else \ - PLATFORM="sunos4"; \ - fi; \ - ;; \ - ULTRIX) \ - PLATFORM="ultrix" \ - ;; \ - OSF1) \ - PLATFORM="osf1" \ - ;; \ - AIX) \ - PLATFORM="aix" \ - ;; \ - HP-UX) \ - PLATFORM="hpux" \ - ;; \ - Linux) \ - PLATFORM="linux" \ - ;; \ - NetBSD) \ - PLATFORM="netbsd" \ - ;; \ - FreeBSD) \ - PLATFORM="freebsd" \ - ;; \ - NeXTSTEP) \ - PLATFORM="nextstep" \ - ;; \ - SCO) \ - PLATFORM="sco" \ - ;; \ - IRIX|IRIX64) \ - PLATFORM="irix" \ - ;; \ - *) echo "unknown platform ($$OS $$OSVERSION $$OSRELEASE)..."; \ - echo "see the file build/PORTS for more information."; \ - exit 1; \ - ;; \ - esac; \ - fi; \ - CC=$(CC); \ - OLDIFS="$$IFS"; \ - IFS=":"; \ - for dir in $$PATH; do \ - if [ -f $$dir/gcc ]; then \ - CC=gcc; \ - break; \ - fi; \ - done; \ - IFS="$$OLDIFS"; \ - $(LN) ./build/platforms/$$PLATFORM-$$CC/Make-platform .make-platform; \ - echo ""; \ - echo "** Set platform to $$PLATFORM with compiler $$CC..."; \ - echo "" - -# -# rule to build Makefiles by concatenating Make-template file in each -# subdirectory with global Make-common, .make-platform, and -# build/Make-append files -# -.makefiles: Make-common .make-platform build/Make-append - @echo "making Makefiles..."; \ - HDRFILE=/tmp/Makehdr.$$$$; \ - DEFSFILE=/tmp/Makedefs.$$$$; \ - $(CAT) build/Make-append ./.make-platform ./Make-common > $$DEFSFILE; \ - echo "# --------------------------------------------------------" > $$HDRFILE; \ - echo "# This file was automatically generated. Do not edit it." >> $$HDRFILE; \ - echo "# Instead, edit the Make-common file (located in the root" >> $$HDRFILE; \ - echo "# (of the LDAP distribution). See the LDAP INSTALL file" >> $$HDRFILE; \ - echo "# for more information." >> $$HDRFILE; \ - echo "# --------------------------------------------------------" >> $$HDRFILE; \ - echo "#" >> $$HDRFILE; \ - for i in `$(FIND) . -type d -print`; do \ - if [ -f $$i/Make-template ]; then \ - echo " creating $$i/Makefile"; \ - $(RM) $$i/Makefile; \ - $(CAT) $$HDRFILE $$i/Make-template $$DEFSFILE > $$i/Makefile; \ - $(CHMOD) 444 $$i/Makefile; \ - fi; \ - done; \ - $(RM) .makefiles; \ - touch .makefiles; \ - $(RM) $$HDRFILE $$DEFSFILE - -# -# rule to always build makefiles -# -makefiles: FORCE - $(RM) .makefiles - $(MAKE) $(MFLAGS) .makefiles - -# -# rule to create any tools we need to build everything else -# -buildtools: FORCE - @echo "making buildtools" - @echo " cd build; $(MAKE) $(MFLAGS)" - @( cd build; $(MAKE) $(MFLAGS) ) - -# -# rule to make a shadow (linked) build area -# -links: FORCE - @if [ -f /usr/bin/swconfig ]; then \ - UNAME=./build/uname.sh; \ - elif [ -f /bin/uname ]; then \ - UNAME=/bin/uname; \ - elif [ -f /usr/bin/uname ]; then \ - UNAME=/usr/bin/uname; \ - else \ - UNAME=./build/uname.sh; \ - fi; \ - if [ ! -z "$(DEST)" ]; then \ - DEST="$(DEST)"; \ - else \ - DEST=./obj-`$$UNAME -s`-`$$UNAME -r` ; \ - fi; \ - echo "making links in $$DEST..."; \ - LINKLIST=/tmp/ldaplinklist.$$$$; \ - $(RM) $$LINKLIST; \ - $(MKDIR) $$DEST; \ - cd $$DEST; $(LN) $(LDAPSRC) .src; \ - $(LN) .src/Makefile . ; \ - $(CP) .src/Make-common . ; $(CHMOD) 644 ./Make-common; \ - for d in build $(SRCDIRS) $(TESTDIR); do \ - ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ - $(LN) .src/Make-template . ; \ - $(MAKE) $(MFLAGS) MKDIR="$(MKDIR)" LN="$(LN)" \ - -f Make-template links ) ; \ - done; \ - echo ""; echo "Now type:"; echo " cd $$DEST"; echo "and make there" - -FORCE: diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000000..bebe3e52b4 --- /dev/null +++ b/Makefile.in @@ -0,0 +1,6 @@ +# Master Makefile for Net Boolean LDAP +# Copyright 1998 Net Boolean Incorporated +# COPYING RESTRICTIONS APPLY, See COPYING file + +SUBDIRS= include libraries clients servers + diff --git a/acconfig.h b/acconfig.h new file mode 100644 index 0000000000..e75f839047 --- /dev/null +++ b/acconfig.h @@ -0,0 +1,24 @@ +/* acconfig.h + This file is in the public domain. + + Descriptive text for the C preprocessor macros that + the distributed Autoconf macros can define. + No software package will use all of them; autoheader copies the ones + your configure.in uses into your configuration header file templates. + + The entries are in sort -df order: alphabetical, case insensitive, + ignoring punctuation (such as underscores). Although this order + can split up related entries, it makes it easier to check whether + a given entry is in the file. + + Leave the following blank line there!! Autoheader needs it. */ + + +/* define this if sys_errlist is not defined in stdio.h or errno.h */ +#undef DECL_SYS_ERRLIST + + +/* Leave that blank line there!! Autoheader needs it. + If you're adding to this file, keep in mind: + The entries are in sort -df order: alphabetical, case insensitive, + ignoring punctuation (such as underscores). */ diff --git a/aclocal.m4 b/aclocal.m4 new file mode 100644 index 0000000000..15ff4746bc --- /dev/null +++ b/aclocal.m4 @@ -0,0 +1,29 @@ +dnl Check for declaration of sys_errlist in one of stdio.h and errno.h. +dnl Declaration of sys_errlist on BSD4.4 interferes with our declaration. +dnl Reported by Keith Bostic. +dnl +AC_DEFUN([CF_SYS_ERRLIST], +[ +AC_MSG_CHECKING([declaration of sys_errlist]) +AC_CACHE_VAL(cf_cv_dcl_sys_errlist,[ + AC_TRY_COMPILE([ +#include +#include +#include ], + [char *c = (char *) *sys_errlist], + [cf_cv_dcl_sys_errlist=yes], + [cf_cv_dcl_sys_errlist=no])]) +AC_MSG_RESULT($cf_cv_dcl_sys_errlist) + +# It's possible (for near-UNIX clones) that sys_errlist doesn't exist +if test $cf_cv_dcl_sys_errlist = no ; then + AC_DEFINE(DECL_SYS_ERRLIST) + AC_MSG_CHECKING([existence of sys_errlist]) + AC_CACHE_VAL(cf_cv_have_sys_errlist,[ + AC_TRY_LINK([#include ], + [char *c = (char *) *sys_errlist], + [cf_cv_have_sys_errlist=yes], + [cf_cv_have_sys_errlist=no])]) + AC_MSG_RESULT($cf_cv_have_sys_errlist) +fi +])dnl diff --git a/clients/Make-template b/clients/Make-template deleted file mode 100644 index 76a02d5a26..0000000000 --- a/clients/Make-template +++ /dev/null @@ -1,84 +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. -# -# LDAP clients Makefile -# -#----------------------------------------------------------------------------- - -############################################################################ -# # -# You should not have to edit anything below this point # -# # -############################################################################ - -all: FORCE - @echo "making all in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ - ( cd $$i; $(MAKE) $(MFLAGS) all ); \ - fi; \ - done - - -# -# rules to install the software -# - -install: FORCE - @echo "making install in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ - ( cd $$i; $(MAKE) $(MFLAGS) install ); \ - fi; \ - done - -# -# rules to make clean -# - -clean: FORCE - @echo "making clean in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ - ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ - fi; \ - done - -veryclean: clean - -# -# rules to make depend -# -# - -depend: FORCE - @echo "making depend in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ - ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ - fi; \ - done - -links: - @echo "making links in `$(PWD)`"; \ - for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ - d=`basename $$i`; \ - ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ - $(LN) ../.src/$$d/Make-template . ; \ - $(MAKE) $(MFLAGS) MKDIR="$(MKDIR)" LN="$(LN)" \ - -f Make-template links ) ; \ - fi; \ - done diff --git a/clients/fax500/Make-template b/clients/fax500/Make-template deleted file mode 100644 index e3b224d772..0000000000 --- a/clients/fax500/Make-template +++ /dev/null @@ -1,87 +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. -# -# X.500 ldap fax mailer makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = rp500.c main.c faxtotpc.c -OBJS = rp500.o main.o faxtotpc.o - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LIBS = -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -all: rp500 fax500 - -rp500: rpversion.o - $(CC) $(ALDFLAGS) -o $@ faxtotpc.o rp500.o rpversion.o \ - -L$(LDIR) $(LIBS) - -fax500: fax5version.o - $(CC) $(ALDFLAGS) -o $@ main.o fax5version.o faxtotpc.o \ - -L$(LDIR) $(LIBS) - -rpversion.c: faxtotpc.o rp500.o $(LDIR)/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Versionrp.c > $@) - -fax5version.c: main.o faxtotpc.o $(LDIR)/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@ ) - -install: rp500 xrpcomp fax500 FORCE - -$(MKDIR) -p $(ETCDIR) $(BINDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(ETCDIR) - $(SED) -e 's%ETCDIR%$(ETCDIR)%' xrpcomp > /tmp/xrpcomp.tmp - $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(BINDIR)/xrpcomp - $(RM) /tmp/xrpcomp.tmp - $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) *.o core a.out rpversion.c fax5version.c rp500 fax500 - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/README .src/xrpcomp .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -rp500.o: rp500.c ../../include/ldapconfig.h ../../include/lber.h -rp500.o: ../../include/ldap.h -main.o: main.c ../../include/ldapconfig.h ../../include/portable.h -main.o: ../../include/lber.h ../../include/ldap.h -faxtotpc.o: faxtotpc.c - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/clients/finger/Make-template b/clients/finger/Make-template deleted file mode 100644 index d55329f839..0000000000 --- a/clients/finger/Make-template +++ /dev/null @@ -1,70 +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. -# -# X.500 ldap finger daemon makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = main.c -OBJS = main.o - -INCLUDES=-I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LIBS = -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -all: in.xfingerd - -in.xfingerd: version.o - $(CC) $(ALDFLAGS) -o $@ $(OBJS) version.o \ - -L$(LDIR) $(LIBS) - -version.c: $(OBJS) $(LDIR)/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: in.xfingerd FORCE - -$(MKDIR) -p $(ETCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 in.xfingerd $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) *.o core a.out version.c in.xfingerd - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/README .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -main.o: main.c ../../include/lber.h ../../include/ldap.h -main.o: ../../include/disptmpl.h ../../include/portable.h -main.o: ../../include/ldapconfig.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/clients/gopher/Make-template b/clients/gopher/Make-template deleted file mode 100644 index 9c45559d7a..0000000000 --- a/clients/gopher/Make-template +++ /dev/null @@ -1,91 +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. -# -# gopher to x.500 gateway makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = go500.c go500gw.c detach.c setproctitle.c -OBJS = go500.o go500gw.o detach.o setproctitle.o -GOOBJS = go500.o detach.o goversion.o setproctitle.o -GWOBJS = go500gw.o detach.o gwversion.o setproctitle.o - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFS) $(ACFLAGS) -LIBS = -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -DLIBS = $(LDIR)/libldap.a $(LDIR)/liblber.a - -all: go500gw go500 - -go500gw: gwversion.o - $(CC) $(ALDFLAGS) -o $@ $(GWOBJS) -L$(LDIR) $(LIBS) - -go500: goversion.o - $(CC) $(ALDFLAGS) -o $@ $(GOOBJS) -L$(LDIR) $(LIBS) - -goversion.c: go500.o detach.o setproctitle.o $(DLIBS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -gwversion.c: go500gw.o detach.o setproctitle.o $(DLIBS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Versiongw.c > $@) - -install: go500 go500gw go500gw.help FORCE - -$(MKDIR) -p $(ETCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 go500 $(ETCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 go500gw $(ETCDIR) - -$(MV) $(ETCDIR)/go500gw.help $(ETCDIR)/go500gw.help- - $(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) *.o core a.out gwversion.c goversion.c go500gw go500 - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/README .src/*.help .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -go500.o: go500.c ../../include/portable.h ../../include/ldapconfig.h -go500.o: ../../include/lber.h ../../include/ldap.h ../../include/disptmpl.h -go500gw.o: go500gw.c ../../include/lber.h ../../include/ldap.h -go500gw.o: ../../include/disptmpl.h ../../include/portable.h -go500gw.o: ../../include/ldapconfig.h -detach.o: detach.c ../../include/portable.h -setproctitle.o: setproctitle.c - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/clients/mail500/Make-template b/clients/mail500/Make-template deleted file mode 100644 index bdac2a2fc4..0000000000 --- a/clients/mail500/Make-template +++ /dev/null @@ -1,68 +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. -# -# X.500 ldap mailer makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = main.c -OBJS = main.o - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LDFLAGS = -L$(LDIR) -LIBS = -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -all: mail500 - -mail500: version.o - $(CC) $(ALDFLAGS) -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) - -version.c: $(OBJS) $(LDIR)/libldap/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: mail500 FORCE - -$(MKDIR) -p $(ETCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 mail500 $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) *.o core a.out version.c mail500 - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/README .src/sendmail.cf .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -main.o: main.c ../../include/portable.h ../../include/lber.h -main.o: ../../include/ldap.h ../../include/ldapconfig.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/clients/rcpt500/Make-template b/clients/rcpt500/Make-template deleted file mode 100644 index 2677021a9e..0000000000 --- a/clients/rcpt500/Make-template +++ /dev/null @@ -1,71 +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. -# -# X.500 ldap rcpt500 mail query responder makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS= main.c cmds.c help.c query.c -OBJS= main.o cmds.o help.o query.o - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LIBS = -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -all: rcpt500 - -rcpt500: version.o - $(CC) $(ALDFLAGS) -o $@ $(OBJS) version.o -L$(LDIR) $(LIBS) - -version.c: $(OBJS) $(LDIR)/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: rcpt500 rcpt500.help FORCE - -$(MKDIR) -p $(ETCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(ETCDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) *.o core a.out version.c rcpt500 - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/README .src/*.[ch] .src/*.help . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -main.o: main.c ../../include/portable.h ../../include/ldapconfig.h rcpt500.h -cmds.o: cmds.c rcpt500.h -help.o: help.c ../../include/portable.h ../../include/ldapconfig.h rcpt500.h -query.o: query.c ../../include/lber.h ../../include/ldap.h -query.o: ../../include/portable.h ../../include/ldapconfig.h -query.o: ../../include/disptmpl.h rcpt500.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/clients/tools/Make-template b/clients/tools/Make-template deleted file mode 100644 index af3b4d5758..0000000000 --- a/clients/tools/Make-template +++ /dev/null @@ -1,118 +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. -# -# LDAP tools makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c -OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LIBS = -lldap -llber -lldif $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -all: ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd - -ldapsearch: ldsversion.o - $(CC) $(ALDFLAGS) -o $@ ldapsearch.o ldsversion.o \ - -L$(LDIR) $(LIBS) - -ldapmodify: ldmversion.o - $(CC) $(ALDFLAGS) -o $@ ldapmodify.o ldmversion.o \ - -L$(LDIR) $(LIBS) - -ldapdelete: lddversion.o - $(CC) $(ALDFLAGS) -o $@ ldapdelete.o lddversion.o -L$(LDIR) $(LIBS) - -ldapmodrdn: ldrversion.o - $(CC) $(ALDFLAGS) -o $@ ldapmodrdn.o ldrversion.o -L$(LDIR) $(LIBS) - -ldapadd: ldapmodify - $(RM) $@ - $(HARDLN) ldapmodify ldapadd - -ldsversion.c: ldapsearch.o - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Versionlds.c > $@) - -ldmversion.c: ldapmodify.o - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Versionldm.c > $@) - -lddversion.c: ldapdelete.o - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Versionldd.c > $@) - -ldrversion.c: ldapmodrdn.o - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Versionldr.c > $@) - -install: ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd FORCE - -$(MKDIR) -p $(BINDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 ldapsearch $(BINDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodify $(BINDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 ldapdelete $(BINDIR) - $(INSTALL) $(INSTALLFLAGS) -m 755 ldapmodrdn $(BINDIR) - $(RM) $(BINDIR)/ldapadd - $(HARDLN) $(BINDIR)/ldapmodify $(BINDIR)/ldapadd - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) *.o core a.out ld*version.c ldapsearch ldapmodify ldapdelete \ - ldapmodrdn ldapadd - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -ldapsearch.o: ldapsearch.c ../../include/lber.h ../../include/ldap.h -ldapsearch.o: ../../include/ldif.h ../../include/ldapconfig.h -ldapmodify.o: ldapmodify.c ../../include/lber.h ../../include/ldap.h -ldapmodify.o: ../../include/ldif.h ../../include/ldapconfig.h -ldapdelete.o: ldapdelete.c ../../include/lber.h ../../include/ldap.h -ldapdelete.o: ../../include/ldapconfig.h -ldapmodrdn.o: ldapmodrdn.c ../../include/lber.h ../../include/ldap.h -ldapmodrdn.o: ../../include/ldapconfig.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/clients/ud/Make-template b/clients/ud/Make-template deleted file mode 100644 index 1cba01cbd1..0000000000 --- a/clients/ud/Make-template +++ /dev/null @@ -1,100 +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. -# -# ud makefile -# -# Use -DUOFM for University of Michigan specifics like: -# if ud should know about noBatchUpdates -# Use -DDOS if building for a DOS machine -# Use -DNOTERMCAP if there is no termcap library -# also need to redefine/undefine the Makefile TERMLIB variable -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS= main.c find.c mod.c print.c auth.c util.c help.c\ - string_to_key.c group.c edit.c globals.c -OBJS= main.o find.o mod.o print.o auth.o util.o help.o\ - string_to_key.o group.o globals.o edit.o -HDRS= ud.h - -INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG) -DEFINES= $(DEFS) -DDEBUG -DCONFIG_FILE=\"$(RUNTIMEETCDIR)/ud.conf\" \ - -DLDAP_FRIENDLY_MAP_FILE=\"$(RUNTIMEETCDIR)/ldapfriendly\" -TERMLIB= -ltermcap - -CFLAGS= ${INCLUDES} ${DEFINES} ${ACFLAGS} -LIBS= ${TERMLIB} -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -PURIFY= -#PURIFY=purify - -all: ud - -ud : version.o - $(PURIFY) ${CC} $(ALDFLAGS) -o $@ version.o ${OBJS} -L${LDIR} ${LIBS} - -version.c: ${OBJS} $(LDIR)/libldap/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: ud FORCE - -$(MKDIR) -p $(BINDIR) - -mv -f ${BINDIR}/ud ${BINDIR}/ud- - $(INSTALL) $(INSTALLFLAGS) -m 775 ud ${BINDIR} - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) $(OBJS) core ud tags version.o version.c - $(RM) *_pure_*.o ud.pure_hardlink ud.pure_linkinfo - -tags: FORCE - $(CTAGS) $(SRCS) ${HDRS} - -lint: FORCE - $(LINT) -Dlint $(INCLUDES) $(DEFINES) $(SRCS) version.c | \ - egrep -v "string_to_key|but not defined" - -5lint: FORCE - $(5LINT) -Dlint $(INCLUDES) $(DEFINES) $(SRCS) version.c - -links: - @$(LN) .src/README .src/etc.ud.conf .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -main.o: main.c ../../include/lber.h ../../include/ldap.h -main.o: ../../include/ldapconfig.h ../../include/portable.h ud.h -find.o: find.c ../../include/lber.h ../../include/ldap.h ud.h -mod.o: mod.c ../../include/lber.h ../../include/ldap.h ud.h -print.o: print.c ../../include/lber.h ../../include/ldap.h ud.h -auth.o: auth.c ../../include/lber.h ../../include/ldap.h -auth.o: ../../include/ldapconfig.h ud.h -util.o: util.c ../../include/lber.h ../../include/ldap.h -util.o: ../../include/ldapconfig.h ../../include/portable.h ud.h -help.o: help.c ../../include/lber.h ../../include/ldap.h ud.h -string_to_key.o: string_to_key.c -group.o: group.c ../../include/lber.h ../../include/ldap.h -group.o: ../../include/ldapconfig.h ud.h -edit.o: edit.c ../../include/lber.h ../../include/ldap.h -edit.o: ../../include/ldapconfig.h ud.h -globals.o: globals.c ud.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/configure.in b/configure.in index c7ddcfbdb1..bc96ed1763 100644 --- a/configure.in +++ b/configure.in @@ -1,45 +1,45 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(build/unproto/error.c) +dnl +dnl Configure.in +dnl +AC_INIT(include/ldap.h) +dnl +dnl +AC_PREREQ(2.10)dnl Required Autoconf version +dnl Do not use AutoConf 2.12; it produces a configuration script +dnl that causes an "internal 2K buffer" error on HPUX when run +dnl with /bin/sh. Autoconf 2.10 seems to be okay. +AC_CONFIG_AUX_DIR(etc) +AC_PREFIX_DEFAULT(/usr/local) +AC_CONFIG_HEADER(include/portable.h)dnl dnl Checks for programs. -AC_PROG_CXX -AC_PROG_AWK AC_PROG_CC -AC_PROG_CPP -AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_RANLIB -dnl Checks for libraries. -dnl Replace `main' with a function in -lavl: -AC_CHECK_LIB(avl, main) -dnl Replace `main' with a function in -lcrypt: -AC_CHECK_LIB(crypt, main) -dnl Replace `main' with a function in -llber: -AC_CHECK_LIB(lber, main) -dnl Replace `main' with a function in -lldap: -AC_CHECK_LIB(ldap, main) -dnl Replace `main' with a function in -lldbm: -AC_CHECK_LIB(ldbm, main) -dnl Replace `main' with a function in -lldif: -AC_CHECK_LIB(ldif, main) -dnl Replace `main' with a function in -llthread: -AC_CHECK_LIB(lthread, main) -dnl Replace `main' with a function in -lm: -AC_CHECK_LIB(m, main) -dnl Replace `main' with a function in -lresolv: -AC_CHECK_LIB(resolv, main) -dnl Replace `main' with a function in -lt: -AC_CHECK_LIB(t, main) -dnl Replace `main' with a function in -ltermcap: -AC_CHECK_LIB(termcap, main) +# FreeBSD (and others) have crypt(3) in -lcrypt +AC_CHECK_LIB(crypt, crypt) + +# FreeBSD has obsoleted re_comp(3) from -lc, needs -lcompat +AC_CHECK_LIB(compat, re_comp) dnl Checks for header files. AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS(fcntl.h limits.h malloc.h sgtty.h sys/file.h sys/ioctl.h sys/time.h syslog.h termio.h unistd.h) +AC_CHECK_HEADERS( \ + fcntl.h \ + limits.h \ + malloc.h \ + sgtty.h \ + sys/file.h \ + sys/ioctl.h \ + sys/time.h \ + syslog.h \ + termio.h \ + unistd.h \ +) dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -58,6 +58,53 @@ AC_TYPE_SIGNAL AC_FUNC_STRFTIME AC_FUNC_VPRINTF AC_FUNC_WAIT3 -AC_CHECK_FUNCS(gethostname gettimeofday mktime re_comp select socket strdup strerror strstr strtod strtol strtoul) -AC_OUTPUT(libraries/libldbm/Makefile build/Makefile libraries/msdos/Makefile clients/tools/Makefile doc/man/man5/Makefile build/platforms/Makefile servers/Makefile clients/fax500/Makefile doc/guides/Makefile contrib/whois++/Makefile doc/man/Makefile contrib/saucer/Makefile Makefile servers/ldapd/Makefile libraries/macintosh/Makefile clients/ud/Makefile include/Makefile tests/Makefile servers/slapd/back-ldbm/Makefile servers/slapd/back-passwd/Makefile libraries/libavl/Makefile libraries/liblber/Makefile libraries/Makefile libraries/vms/Makefile clients/gopher/Makefile doc/Makefile clients/finger/Makefile libraries/libldap/Makefile libraries/liblthread/Makefile libraries/msdos/winsock/makefile servers/slapd/back-shell/Makefile servers/slapd/tools/Makefile servers/slapd/Makefile doc/rfc/Makefile build/platforms/vms/Makefile clients/rcpt500/Makefile servers/slapd/shell-backends/Makefile doc/man/man1/Makefile clients/mail500/Makefile doc/man/man8/Makefile libraries/libldif/Makefile servers/slurpd/Makefile doc/man/man3/Makefile clients/Makefile build/unproto/Makefile) +AC_CHECK_FUNCS( \ + gethostname \ + gettimeofday \ + mktime \ + select \ + socket \ + strdup \ + strerror \ + strstr \ + strtod \ + strtol \ + strtoul \ +) + +AC_ARG_PROGRAM + +# Check Configuration +CF_SYS_ERRLIST + + +AC_OUTPUT( \ +include/ldapconfig.h \ +include/Makefile:etc/top.mk:include/Makefile.in \ +clients/Makefile:etc/top.mk:clients/Makefile.in:etc/dir.mk \ +clients/tools/Makefile:etc/top.mk:clients/tools/Makefile.in:etc/rules.mk \ +clients/ud/Makefile:etc/top.mk:clients/ud/Makefile.in:etc/rules.mk \ +clients/fax500/Makefile:etc/top.mk:clients/fax500/Makefile.in:etc/rules.mk \ +clients/finger/Makefile:etc/top.mk:clients/finger/Makefile.in:etc/rules.mk \ +clients/gopher/Makefile:etc/top.mk:clients/gopher/Makefile.in:etc/rules.mk \ +clients/mail500/Makefile:etc/top.mk:clients/mail500/Makefile.in:etc/rules.mk \ +clients/rcpt500/Makefile:etc/top.mk:clients/rcpt500/Makefile.in:etc/rules.mk \ +libraries/Makefile:etc/top.mk:libraries/Makefile.in:etc/dir.mk \ +libraries/libavl/Makefile:etc/top.mk:libraries/libavl/Makefile.in:etc/lib.mk \ +libraries/liblber/Makefile:etc/top.mk:libraries/liblber/Makefile.in:etc/lib.mk \ +libraries/libldap/Makefile:etc/top.mk:libraries/libldap/Makefile.in:etc/lib.mk \ +libraries/libldbm/Makefile:etc/top.mk:libraries/libldbm/Makefile.in:etc/lib.mk \ +libraries/libldif/Makefile:etc/top.mk:libraries/libldif/Makefile.in:etc/lib.mk \ +libraries/liblthread/Makefile:etc/top.mk:libraries/liblthread/Makefile.in:etc/lib.mk \ +servers/Makefile:etc/top.mk:servers/Makefile.in:etc/dir.mk \ +servers/ldapd/Makefile:etc/top.mk:servers/ldapd/Makefile.in:etc/rules.mk \ +servers/slapd/Makefile:etc/top.mk:servers/slapd/Makefile.in:etc/rules.mk \ +servers/slapd/back-ldbm/Makefile:etc/top.mk:servers/slapd/back-ldbm/Makefile.in:etc/rules.mk \ +servers/slapd/back-passwd/Makefile:etc/top.mk:servers/slapd/back-passwd/Makefile.in:etc/rules.mk \ +servers/slapd/back-shell/Makefile:etc/top.mk:servers/slapd/back-shell/Makefile.in:etc/rules.mk \ +servers/slapd/tools/Makefile:etc/top.mk:servers/slapd/tools/Makefile.in:etc/rules.mk \ +servers/slapd/shell-backends/Makefile:etc/top.mk:servers/slapd/shell-backends/Makefile.in:etc/rules.mk \ +servers/slurpd/Makefile:etc/top.mk:servers/slurpd/Makefile.in:etc/rules.mk \ +Makefile:etc/top.mk:Makefile.in:etc/dir.mk, \ + [date > stamp-h]) diff --git a/include/portable.h b/include/portable.h index a91b27a5d5..c14594a68d 100644 --- a/include/portable.h +++ b/include/portable.h @@ -1,3 +1,5 @@ +/* include/portable.h. Generated automatically by configure. */ +/* include/portable.h.in. Generated automatically from configure.in by autoheader. */ /* * Copyright (c) 1994 Regents of the University of Michigan. * All rights reserved. @@ -10,206 +12,142 @@ * is provided ``as is'' without express or implied warranty. */ -#ifndef _PORTABLE_H -#define _PORTABLE_H +#ifndef _LDAP_PORTABLE_H +#define _LDAP_PORTABLE_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. - */ +/* Define to empty if the keyword does not work. */ +/* #undef const */ -#ifndef SYSV -#if defined( hpux ) || defined( sunos5 ) || defined ( sgi ) || defined( SVR4 ) -#define SYSV -#endif -#endif +/* Define to `int' if doesn't define. */ +/* #undef gid_t */ +/* Define if you don't have vprintf but do have _doprnt. */ +/* #undef HAVE_DOPRNT */ -/* - * under System V, use sysconf() instead of getdtablesize - */ -#if !defined( USE_SYSCONF ) && defined( SYSV ) -#define USE_SYSCONF -#endif +/* Define if your struct stat has st_blksize. */ +#define HAVE_ST_BLKSIZE 1 +/* Define if you have the strftime function. */ +#define HAVE_STRFTIME 1 -/* - * under System V, daemons should use setsid() instead of detaching from their - * tty themselves - */ -#if !defined( USE_SETSID ) && defined( SYSV ) -#define USE_SETSID -#endif +/* Define if you have that is POSIX.1 compatible. */ +#define HAVE_SYS_WAIT_H 1 +/* Define if you have the vprintf function. */ +#define HAVE_VPRINTF 1 -/* - * System V has socket options in filio.h - */ -#if !defined( NEED_FILIO ) && defined( SYSV ) && !defined( hpux ) -#define NEED_FILIO -#endif +/* Define if you have the wait3 system call. */ +#define HAVE_WAIT3 1 -/* - * use lockf() under System V - */ -#if !defined( USE_LOCKF ) && ( defined( SYSV ) || defined( aix )) -#define USE_LOCKF -#endif +/* Define to `long' if doesn't define. */ +/* #undef off_t */ -/* - * on many systems, we should use waitpid() instead of waitN() - */ -#if !defined( USE_WAITPID ) && ( defined( SYSV ) || defined( sunos4 ) || defined( ultrix ) || defined( aix )) -#define USE_WAITPID -#endif +/* Define to `int' if doesn't define. */ +/* #undef pid_t */ +/* Define as the return type of signal handlers (int or void). */ +#define RETSIGTYPE void -/* - * define the wait status argument type - */ -#if ( defined( SunOS ) && SunOS < 40 ) || defined( nextstep ) -#define WAITSTATUSTYPE union wait -#else -#define WAITSTATUSTYPE int -#endif +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ -/* - * define the flags for wait - */ -#ifdef sunos5 -#define WAIT_FLAGS ( WNOHANG | WUNTRACED | WCONTINUED ) -#else -#define WAIT_FLAGS ( WNOHANG | WUNTRACED ) -#endif +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 +/* Define if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 -/* - * defined the options for openlog (syslog) - */ -#ifdef ultrix -#define OPENLOG_OPTIONS LOG_PID -#else -#define OPENLOG_OPTIONS ( LOG_PID | LOG_NOWAIT ) -#endif +/* Define if your declares struct tm. */ +/* #undef TM_IN_SYS_TIME */ +/* Define to `int' if doesn't define. */ +/* #undef uid_t */ -/* - * some systems don't have the BSD re_comp and re_exec routines - */ -#ifndef NEED_BSDREGEX -#if defined( SYSV ) || defined( VMS ) || defined( netbsd ) || defined( freebsd ) || defined( linux ) -#define NEED_BSDREGEX -#endif -#endif +/* define this if sys_errlist is not defined in stdio.h or errno.h */ +/* #undef DECL_SYS_ERRLIST */ -/* - * many systems do not have the setpwfile() library routine... we just - * enable use for those systems we know have it. - */ -#ifndef HAVE_SETPWFILE -#if defined( sunos4 ) || defined( ultrix ) || defined( __osf__ ) -#define HAVE_SETPWFILE -#endif -#endif +/* Define if you have the gethostname function. */ +#define HAVE_GETHOSTNAME 1 -/* - * Are sys_errlist and sys_nerr declared in stdio.h? - */ -#ifndef SYSERRLIST_IN_STDIO -#if defined( freebsd ) -#define SYSERRLIST_IN_STDIO -#endif -#endif +/* Define if you have the gettimeofday function. */ +#define HAVE_GETTIMEOFDAY 1 -/* - * 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 */ - -#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__ */ +/* Define if you have the mktime function. */ +#define HAVE_MKTIME 1 +/* Define if you have the select function. */ +#define HAVE_SELECT 1 -/* - * for signal() -- what do signal handling functions return? - */ -#ifndef SIG_FN -#ifdef sunos5 -# define SIG_FN void /* signal-catching functions return void */ -#else /* sunos5 */ -# ifdef BSD -# if (BSD >= 199006) || defined(NeXT) || defined(__osf__) || defined(sun) || defined(ultrix) || defined(apollo) || defined(POSIX_SIGNALS) -# define SIG_FN void /* signal-catching functions return void */ -# else -# define SIG_FN int /* signal-catching functions return int */ -# endif -# else /* BSD */ -# define SIG_FN void /* signal-catching functions return void */ -# endif /* BSD */ -#endif /* sunos5 */ -#endif /* SIG_FN */ +/* Define if you have the socket function. */ +#define HAVE_SOCKET 1 -/* - * call signal or sigset (signal does not block the signal while - * in the handler on sys v and sigset does not exist on bsd) - */ -#ifdef SYSV -#define SIGNAL sigset -#else -#define SIGNAL signal -#endif +/* Define if you have the strdup function. */ +#define HAVE_STRDUP 1 -/* - * 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 +/* Define if you have the strerror function. */ +#define HAVE_STRERROR 1 -/* - * put a cover on the tty-related ioctl calls we need to use - */ -#if defined( NeXT ) || (defined(SunOS) && SunOS < 40) -#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 /* _PORTABLE_H */ +/* Define if you have the strstr function. */ +#define HAVE_STRSTR 1 + +/* Define if you have the strtod function. */ +#define HAVE_STRTOD 1 + +/* Define if you have the strtol function. */ +#define HAVE_STRTOL 1 + +/* Define if you have the strtoul function. */ +#define HAVE_STRTOUL 1 + +/* Define if you have the header file. */ +#define HAVE_DIRENT_H 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_MALLOC_H */ + +/* Define if you have the header file. */ +/* #undef HAVE_NDIR_H */ + +/* Define if you have the header file. */ +#define HAVE_SGTTY_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_FILE_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_NDIR_H */ + +/* Define if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define if you have the header file. */ +#define HAVE_SYSLOG_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_TERMIO_H */ + +/* Define if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define if you have the compat library (-lcompat). */ +#define HAVE_LIBCOMPAT 1 + +/* Define if you have the crypt library (-lcrypt). */ +#define HAVE_LIBCRYPT 1 + + +#include "bridge.h" +#endif /* _LDAP_PORTABLE_H */ diff --git a/libraries/Make-template b/libraries/Make-template deleted file mode 100644 index 7f6c06df01..0000000000 --- a/libraries/Make-template +++ /dev/null @@ -1,86 +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. -# -# LDAP libraries Makefile -# -#----------------------------------------------------------------------------- - -############################################################################ -# # -# You should not have to edit anything below this point # -# # -############################################################################ - -# -# rules to make the software -# - -all: FORCE - @echo "making all in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ - ( cd $$i; $(MAKE) $(MFLAGS) all ); \ - fi; \ - done - - -# -# rules to install the software -# - -install: FORCE - @echo "making install in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ - ( cd $$i; $(MAKE) $(MFLAGS) install ); \ - fi; \ - done - -# -# rules to make clean -# -clean: FORCE - @echo "making clean in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ - ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ - fi; \ - done - -veryclean: clean - -# -# rules to make depend -# -# -depend: FORCE - @echo "making depend in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ - ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ - fi; \ - done - -links: - @echo "making links in `$(PWD)`"; \ - for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ - d=`basename $$i`; \ - ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ - $(LN) ../.src/$$d/Make-template . ; \ - $(MAKE) $(MFLAGS) MKDIR="$(MKDIR)" LN="$(LN)" \ - -f Make-template links ) ; \ - fi; \ - done diff --git a/libraries/libavl/Make-template b/libraries/libavl/Make-template deleted file mode 100644 index 470737973d..0000000000 --- a/libraries/libavl/Make-template +++ /dev/null @@ -1,71 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# avl library makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. - -SRCS = avl.c -OBJS = avl.o - -HDIR = ../../include - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) - -all: libavl.a - -libavl.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi; \ - $(RM) ../$@; \ - $(LN) libavl/$@ ../$@ - -testavl: libavl.a testavl.o - $(CC) $(ALDFLAGS) -o $@ testavl.o -L. -lavl $(ALIBS) - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) ../../build/version` d=`$(PWD)` \ - h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: all - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libavl.a ../libavl.a testavl *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -avl.o: avl.c ../../include/avl.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/libraries/liblber/Make-template b/libraries/liblber/Make-template deleted file mode 100644 index f1b9dd4f36..0000000000 --- a/libraries/liblber/Make-template +++ /dev/null @@ -1,85 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1990 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. -# -# lightweight ber library makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. -SRCS = decode.c encode.c io.c bprint.c -OBJS = decode.o encode.o io.o bprint.o - -HDIR = ../../include - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) - -all: liblber.a - -liblber.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi; \ - $(RM) ../$@; \ - $(LN) liblber/$@ ../$@ - -idtest: idtest.o - $(CC) $(ALDFLAGS) -o $@ idtest.c $(ISODEINCLUDEFLAG) \ - $(KRBINCLUDEFLAG) $(ISODELIBFLAG) $(ISODELIBS) \ - $(KRBLIBLFAG) $(KRBLIBS) $(ALIBS) - -etest: liblber.a etest.o - $(CC) $(ALDFLAGS) -o $@ etest.o ./liblber.a $(ALIBS) - -dtest: liblber.a dtest.o - $(CC) $(ALDFLAGS) -o $@ dtest.o ./liblber.a $(ALIBS) - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) ../../build/version` d=`$(PWD)` \ - h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: liblber.a FORCE - -$(MKDIR) -p $(LIBDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 liblber.a $(LIBDIR) - @if [ ! -z "$(RANLIB)" ]; then \ - (cd /tmp; $(RANLIB) $(LIBDIR)/liblber.a) \ - fi - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) liblber.a ../liblber.a *.o core a.out version.c dtest etest idtest - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/ldap* .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -decode.o: decode.c ../../include/lber.h -encode.o: encode.c ../../include/lber.h -io.o: io.c ../../include/lber.h -bprint.o: bprint.c ../../include/lber.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/libraries/libldap/Make-template b/libraries/libldap/Make-template deleted file mode 100644 index 9ca5d7f234..0000000000 --- a/libraries/libldap/Make-template +++ /dev/null @@ -1,143 +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. -# -# LDAP library makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. - -SRCS = bind.c open.c result.c error.c compare.c search.c \ - modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \ - getfilter.c regex.c sbind.c kbind.c unbind.c friendly.c cldap.c \ - free.c disptmpl.c srchpref.c dsparse.c tmplout.c sort.c \ - getdn.c getentry.c getattr.c getvalues.c addentry.c \ - request.c getdxbyname.c os-ip.c url.c charset.c -OBJS = bind.o open.o result.o error.o compare.o search.o \ - modify.o add.o modrdn.o delete.o abandon.o ufn.o cache.o \ - getfilter.o regex.o sbind.o kbind.o unbind.o friendly.o cldap.o \ - free.o disptmpl.o srchpref.o dsparse.o tmplout.o sort.o \ - getdn.o getentry.o getattr.o getvalues.o addentry.o \ - request.o getdxbyname.o os-ip.o url.o charset.o - -HDIR = ../../include - -INCLUDES= -I$(HDIR) $(KRBINCLUDEFLAG) -DEFINES = $(DEFS) -DFILTERFILE="\"$(RUNTIMEETCDIR)/ldapfilter.conf\"" \ - -DTEMPLATEFILE="\"$(RUNTIMEETCDIR)/ldaptemplates.conf\"" - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LIBS = -L. -L../liblber -lldap -llber $(KRBLIBFLAG) $(KRBLIBS) $(ALIBS) - -all: libldap.a ltest ttest - -libldap.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi; \ - $(RM) ../$@; \ - $(LN) libldap/$@ ../$@ - -ltest: libldap.a test.o ../liblber/liblber.a - $(CC) $(ALDFLAGS) -o $@ test.o $(LIBS) - -ttest: libldap.a tmpltest.o ../liblber/liblber.a - $(CC) $(ALDFLAGS) -o $@ tmpltest.o $(LIBS) - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) ../../build/version` d=`$(PWD)` \ - h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: libldap.a ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf FORCE - -$(MKDIR) -p $(LIBDIR) - $(INSTALL) $(INSTALLFLAGS) -m 644 libldap.a $(LIBDIR) - @if [ ! -z "$(RANLIB)" ]; then \ - (cd /tmp; $(RANLIB) $(LIBDIR)/libldap.a) \ - fi - -$(MKDIR) -p $(ETCDIR) - -$(MV) $(ETCDIR)/ldapfriendly $(ETCDIR)/ldapfriendly- - $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(ETCDIR) - -$(MV) $(ETCDIR)/ldapfilter.conf $(ETCDIR)/ldapfilter.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfilter.conf $(ETCDIR) - -$(MV) $(ETCDIR)/ldaptemplates.conf $(ETCDIR)/ldaptemplates.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 ldaptemplates.conf $(ETCDIR) - -$(MV) $(ETCDIR)/ldapsearchprefs.conf $(ETCDIR)/ldapsearchprefs.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 ldapsearchprefs.conf $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libldap.a ../libldap.a ltest ttest *.o core a.out *.log version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] .src/ldapfriendly .src/ldapfilter.conf \ - .src/ldaptemplates.conf .src/ldapsearchprefs.conf . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -bind.o: bind.c ../../include/lber.h ../../include/ldap.h -open.o: open.c ../../include/lber.h ../../include/ldap.h ldap-int.h -result.o: result.c ../../include/portable.h ../../include/lber.h -result.o: ../../include/ldap.h ldap-int.h -error.o: error.c ../../include/lber.h ../../include/ldap.h -compare.o: compare.c ../../include/lber.h ../../include/ldap.h ldap-int.h -search.o: search.c ../../include/lber.h ../../include/ldap.h ldap-int.h -modify.o: modify.c ../../include/lber.h ../../include/ldap.h ldap-int.h -add.o: add.c ../../include/lber.h ../../include/ldap.h ldap-int.h -modrdn.o: modrdn.c ../../include/lber.h ../../include/ldap.h ldap-int.h -delete.o: delete.c ../../include/lber.h ../../include/ldap.h ldap-int.h -abandon.o: abandon.c ../../include/lber.h ../../include/ldap.h ldap-int.h -ufn.o: ufn.c ../../include/lber.h ../../include/ldap.h -cache.o: cache.c ../../include/lber.h ../../include/ldap.h ldap-int.h -getfilter.o: getfilter.c ../../include/lber.h ../../include/ldap.h -getfilter.o: ../../include/regex.h -regex.o: regex.c ../../include/portable.h -sbind.o: sbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h -kbind.o: kbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h -unbind.o: unbind.c ../../include/lber.h ../../include/ldap.h ldap-int.h -friendly.o: friendly.c ../../include/lber.h ../../include/ldap.h -cldap.o: cldap.c ../../include/lber.h ../../include/ldap.h ldap-int.h -free.o: free.c ../../include/lber.h ../../include/ldap.h -disptmpl.o: disptmpl.c ../../include/lber.h ../../include/ldap.h -disptmpl.o: ../../include/disptmpl.h -srchpref.o: srchpref.c ../../include/lber.h ../../include/ldap.h -srchpref.o: ../../include/srchpref.h -dsparse.o: dsparse.c ../../include/lber.h ../../include/ldap.h -tmplout.o: tmplout.c ../../include/lber.h ../../include/ldap.h -tmplout.o: ../../include/disptmpl.h -sort.o: sort.c ../../include/lber.h ../../include/ldap.h -getdn.o: getdn.c ../../include/lber.h ../../include/ldap.h -getentry.o: getentry.c ../../include/lber.h ../../include/ldap.h -getattr.o: getattr.c ../../include/lber.h ../../include/ldap.h ldap-int.h -getvalues.o: getvalues.c ../../include/lber.h ../../include/ldap.h -addentry.o: addentry.c ../../include/lber.h ../../include/ldap.h -request.o: request.c ../../include/portable.h ../../include/lber.h -request.o: ../../include/ldap.h ldap-int.h -getdxbyname.o: getdxbyname.c -os-ip.o: os-ip.c ../../include/portable.h ../../include/lber.h -os-ip.o: ../../include/ldap.h -url.o: url.c ../../include/lber.h ../../include/ldap.h ldap-int.h -charset.o: charset.c - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/libraries/libldbm/Make-template b/libraries/libldbm/Make-template deleted file mode 100644 index 09ad2ee08f..0000000000 --- a/libraries/libldbm/Make-template +++ /dev/null @@ -1,71 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# avl library makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. - -SRCS = ldbm.c -OBJS = ldbm.o - -HDIR = ../../include - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) - -all: libldbm.a - -libldbm.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi; \ - $(RM) ../$@; \ - $(LN) libldbm/$@ ../$@ - -testldbm: libldbm.a testldbm.o - $(CC) $(ALDFLAGS) -o $@ testldbm.o -L. -lavl - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) ../../build/version` d=`$(PWD)` \ - h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: all - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libldbm.a ../libldbm.a testldbm *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -ldbm.o: ldbm.c ../../include/ldbm.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/libraries/libldif/Make-template b/libraries/libldif/Make-template deleted file mode 100644 index 75061f7e5d..0000000000 --- a/libraries/libldif/Make-template +++ /dev/null @@ -1,69 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 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. -# -# ldif library makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. - -SRCS = line64.c -OBJS = line64.o - -HDIR = ../../include - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) - -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) - -all: libldif.a - -libldif.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi; \ - $(RM) ../$@; \ - $(LN) libldif/$@ ../$@ - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) ../../build/version` d=`$(PWD)` \ - h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: all - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libldif.a ../libldif.a *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -line64.o: line64.c ../../include/lber.h ../../include/ldap.h -line64.o: ../../include/ldif.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/libraries/liblthread/Make-template b/libraries/liblthread/Make-template deleted file mode 100644 index 2344ba925c..0000000000 --- a/libraries/liblthread/Make-template +++ /dev/null @@ -1,69 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# lthreads library makefile -# -#----------------------------------------------------------------------------- - -LDAPSRC = ../.. - -SRCS = thread.c stack.c -OBJS = thread.o stack.o - -HDIR = ../../include - -INCLUDES= -I$(HDIR) -DEFINES = $(DEFS) $(THREADS) - -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) - -all: liblthread.a - -liblthread.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi; \ - $(RM) ../$@; \ - $(LN) liblthread/$@ ../$@ - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) ../../build/version` d=`$(PWD)` \ - h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: all - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) liblthread.a ../liblthread.a *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -thread.o: thread.c ../../include/lthread.h -stack.o: stack.c ../../include/lber.h ../../include/ldap.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/libraries/macintosh/Make-template b/libraries/macintosh/Make-template deleted file mode 100644 index 0bc9cb9b0b..0000000000 --- a/libraries/macintosh/Make-template +++ /dev/null @@ -1,48 +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. -# -# LDAP libraries/macintosh Makefile -# -#----------------------------------------------------------------------------- - -############################################################################ -# # -# You should not have to edit anything below this point # -# # -############################################################################ - -# -# rules to make the software -# - -all: FORCE - -# -# rules to install the software -# - -install: all - -# -# rules to make clean -# - -clean: FORCE - -veryclean: clean - -# -# rules to make depend -# -# -depend: FORCE - -links: diff --git a/libraries/msdos/Make-template b/libraries/msdos/Make-template deleted file mode 100644 index 205e936f89..0000000000 --- a/libraries/msdos/Make-template +++ /dev/null @@ -1,48 +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. -# -# LDAP libraries/msdos Makefile -# -#----------------------------------------------------------------------------- - -############################################################################ -# # -# You should not have to edit anything below this point # -# # -############################################################################ - -# -# rules to make the software -# - -all: FORCE - -# -# rules to install the software -# - -install: all - -# -# rules to make clean -# - -clean: FORCE - -veryclean: clean - -# -# rules to make depend -# -# -depend: FORCE - -links: diff --git a/libraries/vms/Make-template b/libraries/vms/Make-template deleted file mode 100644 index 2d7ef4e572..0000000000 --- a/libraries/vms/Make-template +++ /dev/null @@ -1,48 +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. -# -# LDAP libraries/vms Makefile -# -#----------------------------------------------------------------------------- - -############################################################################ -# # -# You should not have to edit anything below this point # -# # -############################################################################ - -# -# rules to make the software -# - -all: FORCE - -# -# rules to install the software -# - -install: all - -# -# rules to make clean -# - -clean: FORCE - -veryclean: clean - -# -# rules to make depend -# -# -depend: FORCE - -links: diff --git a/servers/Make-template b/servers/Make-template deleted file mode 100644 index 39eb1240f1..0000000000 --- a/servers/Make-template +++ /dev/null @@ -1,88 +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. -# -# LDAP servers Makefile -# -#----------------------------------------------------------------------------- - -############################################################################ -# # -# You should not have to edit anything below this point # -# # -############################################################################ - -# -# rules to make the software -# - -all: FORCE - @echo "making all in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ - ( cd $$i; $(MAKE) $(MFLAGS) all ); \ - fi; \ - done - - -# -# rules to install the software -# - -install: FORCE - @echo "making install in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo " cd $$i; $(MAKE) $(MFLAGS) install"; \ - ( cd $$i; $(MAKE) $(MFLAGS) install ); \ - fi; \ - done - -# -# rules to make clean -# - -clean: FORCE - @echo "making clean in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ - ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ - fi; \ - done - -veryclean: clean - -# -# rules to make depend -# -# - -depend: FORCE - @echo "making depend in `$(PWD)`" - @for i in *; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ - ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ - fi; \ - done - -links: - @echo "making links in `$(PWD)`"; \ - for i in .src/*; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ - d=`basename $$i`; \ - ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ - $(LN) ../.src/$$d/Make-template . ; \ - $(MAKE) $(MFLAGS) MKDIR="$(MKDIR)" LN="$(LN)" \ - -f Make-template links ) ; \ - fi; \ - done diff --git a/servers/ldapd/Make-template b/servers/ldapd/Make-template deleted file mode 100644 index f8781c5323..0000000000 --- a/servers/ldapd/Make-template +++ /dev/null @@ -1,122 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1990 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. -# -# LDAP server daemon makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = main.c detach.c setproctitle.c request.c bind.c result.c error.c \ - search.c util.c compare.c message.c add.c delete.c modrdn.c modify.c \ - abandon.c syntax.c association.c kerberos.c certificate.c -OBJS = main.o detach.o setproctitle.o request.o bind.o result.o error.o \ - search.o util.o compare.o message.o add.o delete.o modrdn.o modify.o \ - abandon.o syntax.o association.o kerberos.o LDAP_tables.o \ - certificate.o - -INCLUDES= -I. -I$(HDIR) $(ISODEINCLUDEFLAG) $(KRBINCLUDEFLAG) -DEFINES = $(DEFS) $(SERVERDEFS) -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LDFLAGS = -L$(LDIR) $(ISODELIBFLAG) $(KRBLIBFLAG) -LIBS = -llber $(ISODELIBS) $(KRBLIBS) $(ALIBS) - -all: FORCE - @if [ "$(HAVEISODE)" = "yes" ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) ldapd; \ - else \ - echo "uncomment the HAVEISODE=yes line in the Make-common file to build ldapd"; \ - fi - - -ldapd: version.o - $(CC) $(ALDFLAGS) -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) - -sldapd: version.o - $(CC) $(ALDFLAGS) -static -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) -lresolv - -version.c: $(OBJS) $(LDIR)/liblber/liblber.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -request.o: LDAP-types.h - -LDAP_tables.c: ldap.py - @if [ ! -z "$(PEPSY)" ]; then \ - $(PEPSY) -A ldap.py; \ - else \ - touch LDAP_tables.c LDAP-types.h; \ - fi - -LDAP-types.h: LDAP_tables.c - -install: FORCE - @if [ "$(HAVEISODE)" = "yes" ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) install-ldapd; \ - else \ - echo "uncomment the HAVEISODE=yes line in the Make-common file to build and install ldapd"; \ - fi - -install-ldapd: $(ETCDIR) $(ETCDIR)/ldapd - -$(ETCDIR)/ldapd: ldapd - $(INSTALL) $(INSTALLFLAGS) -m 755 ldapd $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) ldapd sldapd *.o core a.out version.c LDAP* - -depend: FORCE - @if [ ! -z "$(HAVEISODE)" ]; then \ - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS); \ - else \ - echo "uncomment the HAVEISODE=yes line in the Make-common file to build ldapd"; \ - fi - -links: - @$(LN) .src/*.py .src/*.[ch] . -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -main.o: main.c ../../include/portable.h ../../include/lber.h -main.o: ../../include/ldap.h common.h -detach.o: detach.c ../../include/portable.h -setproctitle.o: setproctitle.c -request.o: request.c ../../include/lber.h ../../include/ldap.h common.h -bind.o: bind.c ../../include/lber.h ../../include/ldap.h common.h -result.o: result.c ../../include/lber.h ../../include/ldap.h common.h -error.o: error.c ../../include/lber.h ../../include/ldap.h -search.o: search.c ../../include/lber.h ../../include/ldap.h common.h -util.o: util.c ../../include/lber.h ../../include/ldap.h common.h -compare.o: compare.c ../../include/lber.h ../../include/ldap.h common.h -message.o: message.c ../../include/lber.h ../../include/ldap.h common.h -add.o: add.c ../../include/lber.h ../../include/ldap.h common.h -delete.o: delete.c ../../include/lber.h ../../include/ldap.h common.h -modrdn.o: modrdn.c ../../include/lber.h ../../include/ldap.h common.h -modify.o: modify.c ../../include/lber.h ../../include/ldap.h common.h -abandon.o: abandon.c ../../include/lber.h ../../include/ldap.h common.h -syntax.o: syntax.c ../../include/lber.h ../../include/ldap.h common.h -association.o: association.c ../../include/lber.h ../../include/ldap.h common.h -kerberos.o: kerberos.c ../../include/lber.h ../../include/ldap.h common.h -certificate.o: certificate.c ../../include/lber.h ../../include/ldap.h common.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/Make-template b/servers/slapd/Make-template deleted file mode 100644 index d3a5f49884..0000000000 --- a/servers/slapd/Make-template +++ /dev/null @@ -1,266 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# Stand alone LDAP server daemon makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = main.c daemon.c connection.c search.c filter.c add.c charray.c \ - attr.c entry.c config.c backend.c result.c operation.c \ - dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \ - value.c ava.c bind.c unbind.c abandon.c filterentry.c \ - phonetic.c regex.c acl.c str2filter.c aclparse.c init.c \ - detach.c strdup.c tempnam.c repl.c lock.c \ - schema.c schemaparse.c monitor.c configinfo.c -OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \ - attr.o entry.o config.o backend.o result.o operation.o \ - dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \ - value.o ava.o bind.o unbind.o abandon.o filterentry.o \ - phonetic.o regex.o acl.o str2filter.o aclparse.o init.o \ - detach.o strdup.o tempnam.o repl.o lock.o \ - schema.o schemaparse.o monitor.o configinfo.o - -INCLUDES= -I. -I$(HDIR) $(KRBINCLUDEFLAG) -DEFINES = $(DEFS) $(SERVERDEFS) -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) $(THREADS) -LDFLAGS = -L$(LDIR) $(KRBLIBFLAG) -LIBS = $(KRBLIBS) -llber -lldbm -lavl -llthread -lldif $(THREADSLIB) \ - $(LDBMLIB) $(ALIBS) - -all: FORCE - @if [ -z "$(MAKESLAPD)" ]; then \ - echo "uncomment the MAKESLAPD line in Make-common to make slapd"; \ - exit 0; \ - else \ - echo; \ - $(MAKE) $(MFLAGS) backendslib; \ - $(MAKE) $(MFLAGS) slapd; \ - (cd tools; $(MAKE) $(MFLAGS) all); \ - fi - -backendslib: FORCE - @for i in back-*; do \ - if [ -d $$i ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \ - ( cd $$i; $(MAKE) $(MFLAGS) all ); \ - fi; \ - done; \ - echo; \ - $(MAKE) $(MFLAGS) libbackends.a - -libbackends.a: .backend - @$(RM) -r tmp - @$(MKDIR) tmp - @-for i in back-*/*.a; do \ - ( \ - cd tmp; \ - $(AR) x ../$$i; \ - pre=`echo $$i | sed -e 's/\/.*$$//' -e 's/back-//'`; \ - for j in *.o; do \ - mv $$j $${pre}$$j; \ - done; \ - $(AR) ruv libbackends.a *.o 2>&1 | grep -v truncated; \ - $(RM) *.o __.SYMDEF; \ - echo "added backend library $$i"; \ - ); \ - done - @mv -f tmp/libbackends.a ./libbackends.a - @$(RM) -r tmp - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) libbackends.a; \ - fi - @ls -l libbackends.a - -slapd: version.o - $(CC) $(ALDFLAGS) -o slapd $(OBJS) version.o libbackends.a \ - $(LDFLAGS) $(LIBS) -slapd.pure: version.o - purify $(CC) $(ALDFLAGS) -o slapd.pure $(OBJS) version.o libbackends.a \ - $(LDFLAGS) $(LIBS) - -version.c: libbackends.a $(OBJS) $(LDIR)/liblber/liblber.a \ - $(LDIR)/libldbm/libldbm.a $(LDIR)/liblthread/liblthread.a \ - $(LDIR)/libavl/libavl.a $(LDIR)/libldif/libldif.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: all $(ETCDIR) $(ETCDIR)/slapd $(ETCDIR)/slapd.conf \ - $(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.oc.conf \ - install-tools - -$(ETCDIR)/slapd: slapd - $(INSTALL) $(INSTALLFLAGS) -m 755 slapd $(ETCDIR) - -$(ETCDIR)/slapd.conf: slapd.conf - $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' slapd.conf > /tmp/slapd.$$ - -$(MV) $(ETCDIR)/slapd.conf $(ETCDIR)/slapd.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 /tmp/slapd.$$ $(ETCDIR)/slapd.conf - $(RM) -f /tmp/slapd.$$ - -$(ETCDIR)/slapd.at.conf: slapd.at.conf - -$(MV) $(ETCDIR)/slapd.at.conf $(ETCDIR)/slapd.at.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.at.conf $(ETCDIR) - -$(ETCDIR)/slapd.oc.conf: slapd.oc.conf - -$(MV) $(ETCDIR)/slapd.oc.conf $(ETCDIR)/slapd.oc.conf- - $(INSTALL) $(INSTALLFLAGS) -m 644 slapd.oc.conf $(ETCDIR) - -install-tools: FORCE - (cd tools; $(MAKE) $(MFLAGS) install) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - @echo "making clean in `$(PWD)`" - $(RM) slapd slapd.pure *.o core a.out version.c libbackends.a .backend - @for i in back-* tools; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) clean"; \ - ( cd $$i; $(MAKE) $(MFLAGS) clean ); \ - fi; \ - done - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - @for i in back-* tools; do \ - if [ -d $$i -a $$i != "RCS" ]; then \ - echo; echo " cd $$i; $(MAKE) $(MFLAGS) depend"; \ - ( cd $$i; $(MAKE) $(MFLAGS) depend ); \ - fi; \ - done - - -links: - @echo "making links in `$(PWD)`" - @$(LN) .src/*.[ch] .src/*.conf . - @touch .backend - @for i in .src/back-* .src/tools; do \ - if [ -d $$i -a $$i != ".src/RCS" ]; then \ - d=`basename $$i`; \ - ( $(MKDIR) $$d; cd $$d; $(LN) ../.src/$$d .src; \ - $(LN) ../.src/$$d/Make-template . ; \ - $(MAKE) $(MFLAGS) MKDIR="$(MKDIR)" LN="$(LN)" \ - -f Make-template links ) ; \ - fi; \ - done; - - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -main.o: main.c ../../include/portable.h slap.h ../../include/avl.h -main.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -main.o: ../../include/ldif.h ../../include/ldapconfig.h -daemon.o: daemon.c slap.h ../../include/avl.h ../../include/lber.h -daemon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -daemon.o: ../../include/portable.h ../../include/ldapconfig.h -connection.o: connection.c ../../include/portable.h slap.h ../../include/avl.h -connection.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -connection.o: ../../include/ldif.h -search.o: search.c slap.h ../../include/avl.h ../../include/lber.h -search.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -search.o: ../../include/ldapconfig.h -filter.o: filter.c slap.h ../../include/avl.h ../../include/lber.h -filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -add.o: add.c slap.h ../../include/avl.h ../../include/lber.h -add.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -charray.o: charray.c slap.h ../../include/avl.h ../../include/lber.h -charray.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -attr.o: attr.c ../../include/portable.h slap.h ../../include/avl.h -attr.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -attr.o: ../../include/ldif.h -entry.o: entry.c slap.h ../../include/avl.h ../../include/lber.h -entry.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -config.o: config.c slap.h ../../include/avl.h ../../include/lber.h -config.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -config.o: ../../include/ldapconfig.h -backend.o: backend.c slap.h ../../include/avl.h ../../include/lber.h -backend.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -result.o: result.c ../../include/portable.h slap.h ../../include/avl.h -result.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -result.o: ../../include/ldif.h -operation.o: operation.c slap.h ../../include/avl.h ../../include/lber.h -operation.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -dn.o: dn.c ../../include/portable.h slap.h ../../include/avl.h -dn.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -dn.o: ../../include/ldif.h -compare.o: compare.c slap.h ../../include/avl.h ../../include/lber.h -compare.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -modify.o: modify.c slap.h ../../include/avl.h ../../include/lber.h -modify.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -delete.o: delete.c slap.h ../../include/avl.h ../../include/lber.h -delete.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -modrdn.o: modrdn.c slap.h ../../include/avl.h ../../include/lber.h -modrdn.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -ch_malloc.o: ch_malloc.c slap.h ../../include/avl.h ../../include/lber.h -ch_malloc.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -value.o: value.c ../../include/portable.h slap.h ../../include/avl.h -value.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -value.o: ../../include/ldif.h -ava.o: ava.c slap.h ../../include/avl.h ../../include/lber.h -ava.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -bind.o: bind.c slap.h ../../include/avl.h ../../include/lber.h -bind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -unbind.o: unbind.c slap.h ../../include/avl.h ../../include/lber.h -unbind.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -abandon.o: abandon.c slap.h ../../include/avl.h ../../include/lber.h -abandon.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -filterentry.o: filterentry.c ../../include/regex.h slap.h ../../include/avl.h -filterentry.o: ../../include/lber.h ../../include/ldap.h -filterentry.o: ../../include/lthread.h ../../include/ldif.h -phonetic.o: phonetic.c ../../include/portable.h slap.h ../../include/avl.h -phonetic.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -phonetic.o: ../../include/ldif.h -regex.o: regex.c ../../include/portable.h -acl.o: acl.c ../../include/regex.h slap.h ../../include/avl.h -acl.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -acl.o: ../../include/ldif.h -str2filter.o: str2filter.c slap.h ../../include/avl.h ../../include/lber.h -str2filter.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -aclparse.o: aclparse.c ../../include/regex.h slap.h ../../include/avl.h -aclparse.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -aclparse.o: ../../include/ldif.h ../../include/portable.h -init.o: init.c ../../include/portable.h slap.h ../../include/avl.h -init.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -init.o: ../../include/ldif.h -detach.o: detach.c ../../include/portable.h -strdup.o: strdup.c -tempnam.o: tempnam.c -repl.o: repl.c slap.h ../../include/avl.h ../../include/lber.h -repl.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -lock.o: lock.c ../../include/portable.h slap.h ../../include/avl.h -lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -lock.o: ../../include/ldif.h -schema.o: schema.c slap.h ../../include/avl.h ../../include/lber.h -schema.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -schemaparse.o: schemaparse.c slap.h ../../include/avl.h ../../include/lber.h -schemaparse.o: ../../include/ldap.h ../../include/lthread.h -schemaparse.o: ../../include/ldif.h -monitor.o: monitor.c slap.h ../../include/avl.h ../../include/lber.h -monitor.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -monitor.o: ../../include/ldapconfig.h -configinfo.o: configinfo.c slap.h ../../include/avl.h ../../include/lber.h -configinfo.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h -configinfo.o: ../../include/ldapconfig.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/back-ldbm/Make-template b/servers/slapd/back-ldbm/Make-template deleted file mode 100644 index 51ef7a8171..0000000000 --- a/servers/slapd/back-ldbm/Make-template +++ /dev/null @@ -1,148 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# ldbm backend to stand-alone LDAP server makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = idl.c add.c search.c cache.c dbcache.c dn2id.c id2entry.c \ - index.c id2children.c nextid.c abandon.c compare.c \ - modify.c modrdn.c delete.c init.c config.c bind.c attr.c \ - filterindex.c unbind.c kerberos.c close.c -OBJS = idl.o add.o search.o cache.o dbcache.o dn2id.o id2entry.o \ - index.o id2children.o nextid.o abandon.o compare.o \ - modify.o modrdn.o delete.o init.o config.o bind.o attr.o \ - filterindex.o unbind.o kerberos.o close.o - -INCLUDES= -I. -I.. -I$(HDIR) $(KRBINCLUDEFLAG) -DEFINES = $(DEFS) $(THREADS) -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) -LDFLAGS = -L$(LDIR) $(KRBLIBFLAG) - -all: FORCE - -@echo "$(SLAPD_BACKENDS)" | grep LDAP_LDBM 2>&1 > /dev/null; \ - if [ $$? = 0 ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) libback-ldbm.a; \ - else \ - echo "Include -DLDAP_LDBM in SLAPD_BACKENDS in the"; \ - echo "Make-common file to build the ldbm backend"; \ - fi - -libback-ldbm.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi - @touch ../.backend - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libback-ldbm.a *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -idl.o: idl.c ../slap.h ../../../include/avl.h ../../../include/lber.h -idl.o: ../../../include/ldap.h ../../../include/lthread.h -idl.o: ../../../include/ldif.h ../../../include/ldapconfig.h back-ldbm.h -idl.o: ../../../include/ldbm.h -add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h -add.o: ../../../include/ldap.h ../../../include/lthread.h -add.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h -search.o: ../../../include/ldap.h ../../../include/lthread.h -search.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -cache.o: cache.c ../slap.h ../../../include/avl.h ../../../include/lber.h -cache.o: ../../../include/ldap.h ../../../include/lthread.h -cache.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -dbcache.o: dbcache.c ../../../include/portable.h ../slap.h -dbcache.o: ../../../include/avl.h ../../../include/lber.h -dbcache.o: ../../../include/ldap.h ../../../include/lthread.h -dbcache.o: ../../../include/ldif.h ../../../include/ldapconfig.h back-ldbm.h -dbcache.o: ../../../include/ldbm.h -dn2id.o: dn2id.c ../slap.h ../../../include/avl.h ../../../include/lber.h -dn2id.o: ../../../include/ldap.h ../../../include/lthread.h -dn2id.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -id2entry.o: id2entry.c ../slap.h ../../../include/avl.h ../../../include/lber.h -id2entry.o: ../../../include/ldap.h ../../../include/lthread.h -id2entry.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -index.o: index.c ../slap.h ../../../include/avl.h ../../../include/lber.h -index.o: ../../../include/ldap.h ../../../include/lthread.h -index.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -id2children.o: id2children.c ../slap.h ../../../include/avl.h -id2children.o: ../../../include/lber.h ../../../include/ldap.h -id2children.o: ../../../include/lthread.h ../../../include/ldif.h back-ldbm.h -id2children.o: ../../../include/ldbm.h -nextid.o: nextid.c ../slap.h ../../../include/avl.h ../../../include/lber.h -nextid.o: ../../../include/ldap.h ../../../include/lthread.h -nextid.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -abandon.o: abandon.c -compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h -compare.o: ../../../include/ldap.h ../../../include/lthread.h -compare.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h -modify.o: ../../../include/ldap.h ../../../include/lthread.h -modify.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h -modrdn.o: ../../../include/ldap.h ../../../include/lthread.h -modrdn.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h -delete.o: ../../../include/ldap.h ../../../include/lthread.h -delete.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h -init.o: ../../../include/ldap.h ../../../include/lthread.h -init.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h -config.o: ../../../include/ldap.h ../../../include/lthread.h -config.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h -bind.o: ../../../include/ldap.h ../../../include/lthread.h -bind.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -attr.o: attr.c ../slap.h ../../../include/avl.h ../../../include/lber.h -attr.o: ../../../include/ldap.h ../../../include/lthread.h -attr.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -filterindex.o: filterindex.c ../slap.h ../../../include/avl.h -filterindex.o: ../../../include/lber.h ../../../include/ldap.h -filterindex.o: ../../../include/lthread.h ../../../include/ldif.h back-ldbm.h -filterindex.o: ../../../include/ldbm.h -unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h -unbind.o: ../../../include/ldap.h ../../../include/lthread.h -unbind.o: ../../../include/ldif.h -kerberos.o: kerberos.c ../slap.h ../../../include/avl.h ../../../include/lber.h -kerberos.o: ../../../include/ldap.h ../../../include/lthread.h -kerberos.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h -close.o: close.c ../slap.h ../../../include/avl.h ../../../include/lber.h -close.o: ../../../include/ldap.h ../../../include/lthread.h -close.o: ../../../include/ldif.h back-ldbm.h ../../../include/ldbm.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/back-passwd/Make-template b/servers/slapd/back-passwd/Make-template deleted file mode 100644 index 39ea8c292e..0000000000 --- a/servers/slapd/back-passwd/Make-template +++ /dev/null @@ -1,78 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# /etc/passwd file backend to stand-alone LDAP server makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = search.c config.c -OBJS = search.o config.o - -INCLUDES= -I. -I.. -I$(HDIR) -DEFINES = $(DEFS) $(THREADS) -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) - -all: FORCE - -@echo "$(SLAPD_BACKENDS)" | grep LDAP_PASSWD 2>&1 > /dev/null; \ - if [ $$? = 0 ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) libback-passwd.a; \ - else \ - echo "Include -DLDAP_PASSWD in SLAPD_BACKENDS in the"; \ - echo "Make-common file to build the passwd backend"; \ - fi - - -libback-passwd.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi - @touch ../.backend - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: FORCE - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libback-passwd.a *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -search.o: search.c ../../../include/portable.h ../slap.h ../../../include/avl.h -search.o: ../../../include/lber.h ../../../include/ldap.h -search.o: ../../../include/lthread.h ../../../include/ldif.h -config.o: config.c ../../../include/portable.h ../slap.h ../../../include/avl.h -config.o: ../../../include/lber.h ../../../include/ldap.h -config.o: ../../../include/lthread.h ../../../include/ldif.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/back-shell/Make-template b/servers/slapd/back-shell/Make-template deleted file mode 100644 index 1eb631b57e..0000000000 --- a/servers/slapd/back-shell/Make-template +++ /dev/null @@ -1,113 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# shell backend to stand-alone LDAP server makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = init.c config.c fork.c search.c bind.c unbind.c add.c delete.c \ - modify.c modrdn.c compare.c abandon.c result.c -OBJS = init.o config.o fork.o search.o bind.o unbind.o add.o delete.o \ - modify.o modrdn.o compare.o abandon.o result.o - -INCLUDES= -I. -I.. -I$(HDIR) -DEFINES = $(DEFS) $(THREADS) -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) - -all: FORCE - -@echo "$(SLAPD_BACKENDS)" | grep LDAP_SHELL 2>&1 > /dev/null; \ - if [ $$? = 0 ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) libback-shell.a; \ - else \ - echo "Include -DLDAP_SHELL in SLAPD_BACKENDS in the"; \ - echo "Make-common file to build the shell backend"; \ - fi - - -libback-shell.a: version.o - $(AR) ruv $@ $(OBJS) version.o - @if [ ! -z "$(RANLIB)" ]; then \ - $(RANLIB) $@; \ - fi - @touch ../.backend - -version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: FORCE - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) libback-shell.a *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -init.o: init.c ../slap.h ../../../include/avl.h ../../../include/lber.h -init.o: ../../../include/ldap.h ../../../include/lthread.h -init.o: ../../../include/ldif.h shell.h -config.o: config.c ../slap.h ../../../include/avl.h ../../../include/lber.h -config.o: ../../../include/ldap.h ../../../include/lthread.h -config.o: ../../../include/ldif.h shell.h -fork.o: fork.c ../slap.h ../../../include/avl.h ../../../include/lber.h -fork.o: ../../../include/ldap.h ../../../include/lthread.h -fork.o: ../../../include/ldif.h -search.o: search.c ../slap.h ../../../include/avl.h ../../../include/lber.h -search.o: ../../../include/ldap.h ../../../include/lthread.h -search.o: ../../../include/ldif.h shell.h -bind.o: bind.c ../slap.h ../../../include/avl.h ../../../include/lber.h -bind.o: ../../../include/ldap.h ../../../include/lthread.h -bind.o: ../../../include/ldif.h shell.h -unbind.o: unbind.c ../slap.h ../../../include/avl.h ../../../include/lber.h -unbind.o: ../../../include/ldap.h ../../../include/lthread.h -unbind.o: ../../../include/ldif.h shell.h -add.o: add.c ../slap.h ../../../include/avl.h ../../../include/lber.h -add.o: ../../../include/ldap.h ../../../include/lthread.h -add.o: ../../../include/ldif.h shell.h -delete.o: delete.c ../slap.h ../../../include/avl.h ../../../include/lber.h -delete.o: ../../../include/ldap.h ../../../include/lthread.h -delete.o: ../../../include/ldif.h shell.h -modify.o: modify.c ../slap.h ../../../include/avl.h ../../../include/lber.h -modify.o: ../../../include/ldap.h ../../../include/lthread.h -modify.o: ../../../include/ldif.h shell.h -modrdn.o: modrdn.c ../slap.h ../../../include/avl.h ../../../include/lber.h -modrdn.o: ../../../include/ldap.h ../../../include/lthread.h -modrdn.o: ../../../include/ldif.h shell.h -compare.o: compare.c ../slap.h ../../../include/avl.h ../../../include/lber.h -compare.o: ../../../include/ldap.h ../../../include/lthread.h -compare.o: ../../../include/ldif.h shell.h -abandon.o: abandon.c ../slap.h ../../../include/avl.h ../../../include/lber.h -abandon.o: ../../../include/ldap.h ../../../include/lthread.h -abandon.o: ../../../include/ldif.h shell.h -result.o: result.c ../slap.h ../../../include/avl.h ../../../include/lber.h -result.o: ../../../include/ldap.h ../../../include/lthread.h -result.o: ../../../include/ldif.h shell.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/repl.c b/servers/slapd/repl.c index 028b191962..0a3d7c4631 100644 --- a/servers/slapd/repl.c +++ b/servers/slapd/repl.c @@ -5,7 +5,7 @@ #include #include #include -#include +#include "slap.h" extern pthread_mutex_t replog_mutex; extern pthread_mutex_t entry2str_mutex; diff --git a/servers/slapd/shell-backends/Make-template b/servers/slapd/shell-backends/Make-template deleted file mode 100644 index 473c30dacd..0000000000 --- a/servers/slapd/shell-backends/Make-template +++ /dev/null @@ -1,66 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# makefile for shell backends to use with stand-alone LDAP server -# -#----------------------------------------------------------------------------- -LDAPSRC = ../../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -CMNSRCS = shellutil.c -CMNOBJS = shellutil.o - -PWDSRCS = passwd-shell.c -PWDOBJS = passwd-shell.o pwd-version.o - -INCLUDES= -I. -I.. -I$(HDIR) -DEFINES = $(DEFS) $(THREADS) -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) -LDFLAGS = -L$(LDIR) $(KRBLIBFLAG) -LIBS = -llber $(KRBLIBS) $(ALIBS) - -all: passwd-shell - -passwd-shell: $(PWDOBJS) $(CMNOBJS) - $(CC) $(ALDFLAGS) -o $@ $(PWDOBJS) $(CMNOBJS) \ - $(LDFLAGS) $(LIBS) - -pwd-version.c: $(OBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < pwd-Version.c > $@) - -install: FORCE - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - $(RM) passwd-shell pwd-version.c *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/tools/Make-template b/servers/slapd/tools/Make-template deleted file mode 100644 index 112c4abbd8..0000000000 --- a/servers/slapd/tools/Make-template +++ /dev/null @@ -1,219 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# Stand alone LDAP server tools makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -EDB2LDIFSRCS = edb2ldif.c ldapsyntax.c -EDB2LDIFOBJS = edb2ldif.o ldapsyntax.o ../strdup.o - -OBJS2 = ../config.o ../ch_malloc.o ../backend.o ../charray.o \ - ../aclparse.o ../schema.o ../result.o ../filterentry.o \ - ../acl.o ../phonetic.o ../attr.o ../value.o ../entry.o \ - ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \ - ../schemaparse.o ../regex.o ../strdup.o - -INCLUDES= -I. -I$(HDIR) $(EXINCLUDES) -DEFINES = $(DEFS) $(SERVERDEFS) $(THREADS) -CFLAGS = $(INCLUDES) $(DEFINES) $(ACFLAGS) -LDFLAGS = -L$(LDIR) $(EXLDFLAGS) -LIBS = -lldif -lldap -llber -lldbm -lavl $(LDBMLIB) $(EXLIBS) $(ALIBS) -LIBS2 = -lldif -lldbm -lavl $(LDBMLIB) -llber $(KRBLIBFLAG) $(KRBLIBS) \ - -llthread $(THREADSLIB) $(ALIBS) - -all: build-edb2ldif ldif2index ldif2ldbm ldbmcat ldif2id2entry \ - ldif2id2children centipede ldbmtest ldif - -build-edb2ldif: FORCE - @if [ "$(HAVEISODE)" = "yes" ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) EXINCLUDES="$(ISODEINCLUDEFLAG)" \ - EXLDFLAGS="$(ISODELIBFLAG)" EXLIBS="$(ISODELIBS)" edb2ldif; \ - else \ - echo "uncomment the HAVEISODE=yes line in the Make-common file to build edb2ldif"; \ - fi - -edb2ldif: edb2-vers.o - $(CC) $(ALDFLAGS) -o $@ $(EDB2LDIFOBJS) edb2-vers.o \ - $(LDFLAGS) $(LIBS) - -edb2-vers.c: $(EDB2LDIFOBJS) - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Vers-edb2.c > $@) - -build-chlog2replog: FORCE - @if [ "$(HAVEISODE)" = "yes" ]; then \ - $(MAKE) $(MFLAGS) CC=$(CC) EXINCLUDES="$(ISODEINCLUDEFLAG)" \ - EXLDFLAGS="$(ISODELIBFLAG)" EXLIBS="$(ISODELIBS)" chlog2replog; \ - else \ - echo "uncomment the HAVEISODE=yes line in the Make-common file to build chlog2replog"; \ - fi - -chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o - $(CC) $(ALDFLAGS) -o $@ chlog2replog.o ../lock.o ../ch_malloc.o \ - $(LDFLAGS) $(LIBS) - -ldif2index: ldif2index.o ../libbackends.a $(OBJS2) - $(CC) $(ALDFLAGS) -o $@ ldif2index.o $(OBJS2) \ - ../libbackends.a $(LDFLAGS) $(LIBS2) - -ldif2ldbm: ldif2ldbm.sed.o ../libbackends.a $(OBJS2) - $(CC) $(ALDFLAGS) -o $@ ldif2ldbm.sed.o $(OBJS2) \ - ../libbackends.a $(LDFLAGS) $(LIBS2) - -ldif2ldbm.sed.c: ldif2ldbm.c - $(SED) -e 's;%ETCDIR%;$(RUNTIMEETCDIR);' ldif2ldbm.c > ldif2ldbm.sed.c - -ldif2id2entry: ldif2id2entry.o ../libbackends.a $(OBJS2) - $(CC) $(ALDFLAGS) -o $@ ldif2id2entry.o $(OBJS2) \ - ../libbackends.a $(LDFLAGS) $(LIBS2) - -ldif2id2children: ldif2id2children.o ../libbackends.a $(OBJS2) - $(CC) $(ALDFLAGS) -o $@ ldif2id2children.o $(OBJS2) \ - ../libbackends.a $(LDFLAGS) $(LIBS2) - -ldbmcat: ldbmcat.o - $(CC) $(ALDFLAGS) -o $@ ldbmcat.o $(LDFLAGS) $(LIBS) - -ldif: ldif.o - $(CC) $(ALDFLAGS) -o $@ ldif.o $(LDFLAGS) $(LIBS) $(LIBS2) - -centipede: centipede.o - $(CC) $(ALDFLAGS) -o $@ centipede.o $(LDFLAGS) $(LIBS) \ - $(KRBLIBFLAG) $(KRBLIBS) - -sizecount: sizecount.o ../phonetic.o ../ch_malloc.o - $(CC) $(ALDFLAGS) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o \ - $(LDFLAGS) $(LIBS) $(KRBLIBFLAG) $(KRBLIBS) - -ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2) - $(CC) $(ALDFLAGS) -o ldbmtest ldbmtest.o $(OBJS2) \ - ../libbackends.a $(LDFLAGS) $(LIBS2) - -install: $(ETCDIR) $(ETCDIR)/edb2ldif $(ETCDIR)/ldif2ldbm \ - $(ETCDIR)/ldif2index $(ETCDIR)/ldif2id2entry \ - $(ETCDIR)/ldif2id2children $(ETCDIR)/ldbmcat \ - $(ETCDIR)/centipede $(ETCDIR)/ldbmtest \ - $(ETCDIR)/ldif - -$(ETCDIR)/edb2ldif: build-edb2ldif - @if [ "$(HAVEISODE)" = "yes" ]; then \ - $(INSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(ETCDIR); \ - else \ - exit 0; \ - fi - -$(ETCDIR)/chlog2replog: build-chlog2replog - @if [ "$(HAVEISODE)" = "yes" ]; then \ - $(INSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(ETCDIR); \ - else \ - exit 0; \ - fi - -$(ETCDIR)/ldif2ldbm: ldif2ldbm - $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2ldbm $(ETCDIR) - -$(ETCDIR)/ldif2index: ldif2index - $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2index $(ETCDIR) - -$(ETCDIR)/ldif2id2entry: ldif2id2entry - $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2entry $(ETCDIR) - -$(ETCDIR)/ldif2id2children: ldif2id2children - $(INSTALL) $(INSTALLFLAGS) -m 755 ldif2id2children $(ETCDIR) - -$(ETCDIR)/ldbmcat: ldbmcat - $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmcat $(ETCDIR) - -$(ETCDIR)/ldif: ldif - $(INSTALL) $(INSTALLFLAGS) -m 755 ldif $(ETCDIR) - -$(ETCDIR)/centipede: centipede - $(INSTALL) $(INSTALLFLAGS) -m 755 centipede $(ETCDIR) - -$(ETCDIR)/ldbmtest: ldbmtest - $(INSTALL) $(INSTALLFLAGS) -m 755 ldbmtest $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - @echo "making clean in `$(PWD)`" - $(RM) edb2ldif ldif2index *.o core a.out edb2-vers.c \ - ldif2ldbm ldif2id2entry ldif2id2children ldbmcat ldif \ - centipede chlog2replog sizecount ldif2ldbm.sed.c ldbmtest - -depend: ldif2ldbm.sed.c FORCE - @if [ ! -z "$(HAVEISODE)" ]; then \ - DEPENDEXTRAS="$(ISODEINCLUDEFLAG) chlog2replog.c $(EDB2LDIFSRCS)"; \ - fi; \ - $(MKDEP) $(INCLUDES) $(DEFINES) $$DEPENDEXTRAS ldif2index.c \ - ldif2ldbm.c ldif2id2entry.c ldif2id2children.c ldbmcat.c \ - centipede.c sizecount.c ldif2ldbm.sed.c ldbmtest.c ldif.c - -links: - @echo "making links in `$(PWD)`" - @$(LN) .src/*.[ch] . - - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -chlog2replog.o: chlog2replog.c ../../../include/ldif.h -edb2ldif.o: edb2ldif.c -ldapsyntax.o: ldapsyntax.c ../../../include/lber.h ../../../include/ldap.h -ldapsyntax.o: ../../../include/ldif.h ldapsyntax.h -ldif2index.o: ldif2index.c ../slap.h ../../../include/avl.h -ldif2index.o: ../../../include/lber.h ../../../include/ldap.h -ldif2index.o: ../../../include/lthread.h ../../../include/ldif.h -ldif2ldbm.o: ldif2ldbm.c ../slap.h ../../../include/avl.h -ldif2ldbm.o: ../../../include/lber.h ../../../include/ldap.h -ldif2ldbm.o: ../../../include/lthread.h ../../../include/ldif.h -ldif2ldbm.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h -ldif2id2entry.o: ldif2id2entry.c ../slap.h ../../../include/avl.h -ldif2id2entry.o: ../../../include/lber.h ../../../include/ldap.h -ldif2id2entry.o: ../../../include/lthread.h ../../../include/ldif.h -ldif2id2entry.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h -ldif2id2children.o: ldif2id2children.c ../slap.h ../../../include/avl.h -ldif2id2children.o: ../../../include/lber.h ../../../include/ldap.h -ldif2id2children.o: ../../../include/lthread.h ../../../include/ldif.h -ldif2id2children.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h -ldbmcat.o: ldbmcat.c ../../../include/ldbm.h ../slap.h ../../../include/avl.h -ldbmcat.o: ../../../include/lber.h ../../../include/ldap.h -ldbmcat.o: ../../../include/lthread.h ../../../include/ldif.h -centipede.o: centipede.c ../../../include/lber.h ../../../include/ldap.h -centipede.o: ../../../include/ldapconfig.h ../../../include/ldbm.h -sizecount.o: sizecount.c ../../../include/ldbm.h ../../../include/lber.h -sizecount.o: ../../../include/ldap.h ../../../include/portable.h -ldif2ldbm.sed.o: ldif2ldbm.sed.c ../slap.h ../../../include/avl.h -ldif2ldbm.sed.o: ../../../include/lber.h ../../../include/ldap.h -ldif2ldbm.sed.o: ../../../include/lthread.h ../../../include/ldif.h -ldif2ldbm.sed.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h -ldbmtest.o: ldbmtest.c ../../../include/portable.h -ldbmtest.o: ../../../include/ldapconfig.h ../slap.h ../../../include/avl.h -ldbmtest.o: ../../../include/lber.h ../../../include/ldap.h -ldbmtest.o: ../../../include/lthread.h ../../../include/ldif.h -ldbmtest.o: ../back-ldbm/back-ldbm.h ../../../include/ldbm.h -ldif.o: ldif.c ../../../include/lber.h ../../../include/ldap.h -ldif.o: ../../../include/ldif.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slapd/tools/ldif.c b/servers/slapd/tools/ldif.c index dc9f25d584..283d494571 100644 --- a/servers/slapd/tools/ldif.c +++ b/servers/slapd/tools/ldif.c @@ -25,6 +25,7 @@ main( argc, argv ) char buf[BUFSIZ]; char *type, *out; int binary = 0; + int len; if (argc < 2 || argc > 3 ) { usage( argv[0] ); @@ -79,7 +80,9 @@ main( argc, argv ) } /* not binary: one value per line... */ - while ( gets( buf ) != NULL ) { + while ( fgets( buf, sizeof(buf), stdin ) != NULL ) { + if(buf[len=strlen(buf)] == '\n') buf[len] = '\0'; + if (( out = ldif_type_and_value( type, buf, strlen( buf ) )) == NULL ) { perror( "ldif_type_and_value" ); diff --git a/servers/slurpd/Make-template b/servers/slurpd/Make-template deleted file mode 100644 index a43494093d..0000000000 --- a/servers/slurpd/Make-template +++ /dev/null @@ -1,147 +0,0 @@ -#----------------------------------------------------------------------------- -# Copyright (c) 1995 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. -# -# Stand-alone LDAP Update RePlication Daemon makefile -# -#----------------------------------------------------------------------------- -LDAPSRC = ../.. -HDIR = $(LDAPSRC)/include -LDIR = $(LDAPSRC)/libraries -VERSIONFILE = $(LDAPSRC)/build/version - -SRCS = admin.c args.c ch_malloc.c config.c detach.c \ - fm.c globals.c ldap_op.c lock.c main.c re.c \ - reject.c replica.c replog.c ri.c rq.c sanity.c st.c \ - tsleep.c - -OBJS = admin.o args.o ch_malloc.o config.o detach.o \ - fm.o globals.o ldap_op.o lock.o main.o re.o \ - reject.o replica.o replog.o ri.o rq.o sanity.o st.o \ - tsleep.o - -INCLUDES= -I. -I$(HDIR) $(KRBINCLUDEFLAG) -DEFINES = $(DEFS) $(SERVERDEFS) -CFLAGS = $(INCLUDES) $(THREADSINCLUDE) $(DEFINES) $(ACFLAGS) $(THREADS) -LDFLAGS = -L$(LDIR) $(KRBLIBFLAG) -LIBS = -lldap -llber -lm -llthread -lldif $(THREADSLIB) $(KRBLIBS) \ - $(ALIBS) - -all: FORCE - @if [ -z "$(MAKESLAPD)" ]; then \ - echo "uncomment the MAKESLAPD line in Make-common to make slurpd"; \ - exit 0; \ - else \ - make slurpd; \ - fi - -slurpd: version.o - $(CC) $(ALDFLAGS) -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) - -slurpd.pure: version.o - purify $(CC) $(ALDFLAGS) -o $@ $(OBJS) version.o $(LDFLAGS) $(LIBS) - -version.c: $(OBJS) $(LDIR)/liblber/liblber.a $(LDIR)/libldap/libldap.a - $(RM) $@ - (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \ - t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \ - -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \ - -e "s|%VERSION%|$${v}|" \ - < Version.c > $@) - -install: $(ETCDIR) $(ETCDIR)/slurpd - -$(ETCDIR)/slurpd: slurpd - $(INSTALL) $(INSTALLFLAGS) -m 755 slurpd $(ETCDIR) - -lint: FORCE - $(LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -5lint: FORCE - $(5LINT) $(INCLUDES) $(DEFINES) $(SRCS) - -clean: FORCE - @echo "making clean in `$(PWD)`" - $(RM) slurpd *.o core a.out version.c - -depend: FORCE - $(MKDEP) $(INCLUDES) $(DEFINES) $(SRCS) - -links: - @echo "making links in `$(PWD)`" - @$(LN) .src/*.[ch] . - -# DO NOT DELETE THIS LINE -- mkdep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -admin.o: admin.c slurp.h ../../include/lber.h ../../include/ldap.h -admin.o: ../../include/lthread.h ../../include/portable.h -admin.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -args.o: args.c ../../include/lber.h ../../include/ldap.h slurp.h -args.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -args.o: ../../include/portable.h ../../include/ldapconfig.h -args.o: ../../include/ldif.h globals.h slurp.h -ch_malloc.o: ch_malloc.c ../slapd/slap.h ../../include/avl.h -ch_malloc.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -ch_malloc.o: ../../include/ldif.h -config.o: config.c ../../include/lber.h ../../include/ldap.h slurp.h -config.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -config.o: ../../include/portable.h ../../include/ldapconfig.h -config.o: ../../include/ldif.h globals.h slurp.h -detach.o: detach.c ../../include/portable.h -fm.o: fm.c slurp.h ../../include/lber.h ../../include/ldap.h -fm.o: ../../include/lthread.h ../../include/portable.h -fm.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -globals.o: globals.c slurp.h ../../include/lber.h ../../include/ldap.h -globals.o: ../../include/lthread.h ../../include/portable.h -globals.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -ldap_op.o: ldap_op.c ../../include/lber.h ../../include/ldap.h -ldap_op.o: ../../include/portable.h slurp.h ../../include/lber.h -ldap_op.o: ../../include/ldap.h ../../include/lthread.h -ldap_op.o: ../../include/portable.h ../../include/ldapconfig.h -ldap_op.o: ../../include/ldif.h -lock.o: lock.c ../../include/portable.h ../slapd/slap.h ../../include/avl.h -lock.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -lock.o: ../../include/ldif.h -main.o: main.c slurp.h ../../include/lber.h ../../include/ldap.h -main.o: ../../include/lthread.h ../../include/portable.h -main.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -re.o: re.c ../slapd/slap.h ../../include/avl.h ../../include/lber.h -re.o: ../../include/ldap.h ../../include/lthread.h ../../include/ldif.h slurp.h -re.o: ../../include/lber.h ../../include/ldap.h ../../include/lthread.h -re.o: ../../include/portable.h ../../include/ldapconfig.h ../../include/ldif.h -re.o: globals.h slurp.h -reject.o: reject.c slurp.h ../../include/lber.h ../../include/ldap.h -reject.o: ../../include/lthread.h ../../include/portable.h -reject.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -replica.o: replica.c slurp.h ../../include/lber.h ../../include/ldap.h -replica.o: ../../include/lthread.h ../../include/portable.h -replica.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -replog.o: replog.c ../../include/portable.h slurp.h ../../include/lber.h -replog.o: ../../include/ldap.h ../../include/lthread.h ../../include/portable.h -replog.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -ri.o: ri.c slurp.h ../../include/lber.h ../../include/ldap.h -ri.o: ../../include/lthread.h ../../include/portable.h -ri.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -rq.o: rq.c slurp.h ../../include/lber.h ../../include/ldap.h -rq.o: ../../include/lthread.h ../../include/portable.h -rq.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -sanity.o: sanity.c slurp.h ../../include/lber.h ../../include/ldap.h -sanity.o: ../../include/lthread.h ../../include/portable.h -sanity.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -sanity.o: ../../include/portable.h -st.o: st.c slurp.h ../../include/lber.h ../../include/ldap.h -st.o: ../../include/lthread.h ../../include/portable.h -st.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h -tsleep.o: tsleep.c slurp.h ../../include/lber.h ../../include/ldap.h -tsleep.o: ../../include/lthread.h ../../include/portable.h -tsleep.o: ../../include/ldapconfig.h ../../include/ldif.h globals.h slurp.h - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/servers/slurpd/fm.c b/servers/slurpd/fm.c index 2d36838bb5..5966c0a03b 100644 --- a/servers/slurpd/fm.c +++ b/servers/slurpd/fm.c @@ -54,9 +54,9 @@ static void set_shutdown(); void do_nothing(); #endif /* NEEDPROTOS */ -#ifndef SYSERRLIST_IN_STDIO +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; -#endif /* SYSERRLIST_IN_STDIO */ +#endif /* DECL_SYS_ERRLIST */ diff --git a/servers/slurpd/ldap_op.c b/servers/slurpd/ldap_op.c index 08253921cd..c961d7d0cd 100644 --- a/servers/slurpd/ldap_op.c +++ b/servers/slurpd/ldap_op.c @@ -48,9 +48,9 @@ static int do_unbind( Ri * ); /* External references */ -#ifndef SYSERRLIST_IN_STDIO +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; -#endif /* SYSERRLIST_IN_STDIO */ +#endif /* DECL_SYS_ERRLIST */ extern char *ch_malloc( unsigned long ); diff --git a/servers/slurpd/re.c b/servers/slurpd/re.c index 4a6dc38237..47ca58743a 100644 --- a/servers/slurpd/re.c +++ b/servers/slurpd/re.c @@ -31,7 +31,9 @@ extern char *str_getline( char **next ); extern void ch_free( char *p ); +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; +#endif /* DECL_SYS_ERRLIST */ /* Forward references */ static Rh *get_repl_hosts( char *, int *, char ** ); diff --git a/servers/slurpd/reject.c b/servers/slurpd/reject.c index 8ae0dc6363..568fa88a98 100644 --- a/servers/slurpd/reject.c +++ b/servers/slurpd/reject.c @@ -27,9 +27,9 @@ #include "slurp.h" #include "globals.h" -#ifndef SYSERRLIST_IN_STDIO +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; -#endif /* SYSERRLIST_IN_STDIO */ +#endif /* DECL_SYS_ERRLIST */ /* diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c index c3a855cffe..247ca3d0cb 100644 --- a/servers/slurpd/replog.c +++ b/servers/slurpd/replog.c @@ -52,9 +52,9 @@ int file_nonempty(); #endif /* NEEDPROTOS */ -#ifndef SYSERRLIST_IN_STDIO +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; -#endif +#endif /* DECL_SYS_ERRLIST */ /* * Forward declarations diff --git a/servers/slurpd/rq.c b/servers/slurpd/rq.c index 54adb4da1a..0d7b31d9d5 100644 --- a/servers/slurpd/rq.c +++ b/servers/slurpd/rq.c @@ -44,9 +44,9 @@ extern void Re_dump( Re *re ); extern void Re_dump(); #endif /* NEEDPROTOS */ - +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; - +#endif /* DECL_SYS_ERRLIST /* * Lock the replication queue. diff --git a/servers/slurpd/st.c b/servers/slurpd/st.c index 610b295853..56b46a4132 100644 --- a/servers/slurpd/st.c +++ b/servers/slurpd/st.c @@ -25,9 +25,9 @@ #include "slurp.h" #include "globals.h" -#ifndef SYSERRLIST_IN_STDIO +#ifdef DECL_SYS_ERRLIST extern char *sys_errlist[]; -#endif /* SYSERRLIST_IN_STDIO */ +#endif /* DECL_SYS_ERRLIST */ /* * Add information about replica host specified by Ri to list @@ -56,8 +56,7 @@ St_add( pthread_mutex_unlock( &(st->st_mutex )); return NULL; } - st->st_data[ ind ] = ( Stel * ) ch_malloc( st->st_data, - sizeof( Stel )); + st->st_data[ ind ] = ( Stel * ) ch_malloc( sizeof( Stel ) ); if ( st->st_data[ ind ] == NULL ) { pthread_mutex_unlock( &(st->st_mutex )); return NULL; -- 2.47.2