mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-04-06 15:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update build environment to fix VPATH support.

Browse Source 
make depend, make tests, and make install all work when build directory
  is not the $srcdir.
Also modified library handling such that -lpthread more likely to be last.
WARNING: new orderring requires use of LDFLAGS to set global loader options
  such as -L/usr/local/lib.  If you put this in LIBS, some libraries
  may not be found a link time.
Likely broke Kerberos/LDAPD support.  Don't have those in my testbed.
This commit is contained in:
Kurt Zeilenga 1999-01-10 02:25:41 +00:00
parent d0516836b5
commit 334768c1bb
37 changed files with 609 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
acconfig.h
View File

@ -10,14 +10,26 @@
/* define this if needed to get reentrant functions */
#ifndef REENTRANT
#undef REENTRANT
#endif
#ifndef _REENTRANT
#undef _REENTRANT
#endif
/* define this if needed to get threadsafe functions */
#ifndef THREADSAFE
#undef THREADSAFE
#endif
#ifndef _THREADSAFE
#undef _THREADSAFE
#endif
#ifndef THREAD_SAFE
#undef THREAD_SAFE
#endif
#ifndef _THREAD_SAFE
#undef _THREAD_SAFE
#endif
/* define this if cross compiling */
#undef CROSS_COMPILING

1
build/man.mk
View File

@ -12,6 +12,7 @@ install-common: FORCE
-$(MKDIR) -p $(MANDIR)
@TMPMAN=/tmp/ldapman.$$$$$(MANCOMPRESSSUFFIX); \
VERSION=`$(CAT) $(VERSIONFILE)`; \
cd $(srcdir); \
for page in *.$(MANSECT); do \
$(SED) -e "s%LDVERSION%$$VERSION%" \
-e 's%ETCDIR%$(sysconfdir)%' \

79
build/mkdep
View File

@ -26,14 +26,26 @@ set -e # exit immediately if any errors occur
MAKE=Makefile # default makefile name is "Makefile"
NOSLASH="no" # by default, / dependencies are included
CC=${CC-cc} # default compiler is cc
SRCDIR=""
SED=cat
while :
do case "$1" in
# the -s flag removes dependencies to files that begin with /
-s)
NOSLASH=yes;
shift ;;
# -f allows you to select a makefile name
-f)
MAKE=$2
shift; shift ;;
# -d allows you to select a VPATH directory
-d)
SRCDIR=$2
shift; shift ;;
# -c allows you to select a compiler to use (default is cc)
-c)
CC=$2
@ -42,18 +54,13 @@ while :
# the -p flag produces "program: program.c" style dependencies
# so .o's don't get produced
-p)
SED='s;\.o;;'
SED='sed -e s;\.o;;'
shift ;;
# the -l flag produces libtool compatible dependencies
-l)
SED='s;\.o:;.lo:;'
shift ;;
# the -s flag removes dependencies to files that begin with /
-s)
NOSLASH=yes;
SED='sed -e s;\.o:;.lo:;'
shift ;;
# -*) shift ;;
@ -64,7 +71,7 @@ while :
done
if [ $# = 0 ] ; then
echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [flags] file ...'
echo 'usage: mkdep [-p] [-s] [-c cc] [-f makefile] [-d srcdir] [flags] file ...'
exit 1
fi
@ -95,10 +102,34 @@ _EOF_
# egrep '^#include[ ]*".*"' /dev/null $* |
# sed -e 's/:[^"]*"\([^"]*\)".*/: \1/' -e 's/\.c/.o/' |
$CC -M $* |
sed "
s; \./; ;g
$SED" |
if test "x$SRCDIR" = "x" ; then
files=$*
else
files=
for i in $* ; do
if test -f $i ; then
files="$files $i"
elif test -f $SRCDIR/$i ; then
files="$files $SRCDIR/$i"
else
files="$files $i"
fi
done
CC="$CC -I$SRCDIR"
fi
cat << _EOF_ >> $TMP
#
# files: $*
# command: $CC -M $files
#
_EOF_
$CC -M $files | \
sed -e 's; \./; ;g' | \
$SED | \
awk '
$1 ~ /:/ {
filenm=$1
@ -108,25 +139,13 @@ $1 !~ /:/ {
dep=$1
}
/.*/ {
if ( noslash = "yes" && dep ~ /^\// ) next
if (filenm != prev) {
if (rec != "")
print rec;
rec = filenm " " dep;
prev = filenm;
}
else {
if (length(rec dep) > 78) {
print rec;
rec = filenm " " dep;
}
else
rec = rec " " dep
}
if (( noslash == "yes") && (dep ~ /^\// )) next
if ( length(dep) < 2 ) next
rec = filenm " " dep;
print rec;
}
END {
print rec
}' noslash="$NOSLASH" >> $TMP
' noslash="$NOSLASH" >> $TMP
cat << _EOF_ >> $TMP

42
build/top.mk
View File

@ -49,11 +49,11 @@ AR = ar
LINT = lint
5LINT = 5lint
MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -c "$(CC)"
MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
LIBTOOL = @LIBTOOL@
LIBVERSION = 0:0:0
LTLINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LFLAGS) $(LTVERSION)
LTLINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $(LTVERSION)
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
# Misc UNIX commands used in makefiles
@ -85,32 +85,46 @@ LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
LDAP_LIBADIR= $(top_builddir)/libraries
LDAP_LIBPATH= -L$(LDAP_LIBADIR)
LDAP_LIBLBER = $(LDAP_LIBADIR)/liblber/liblber.la
LDAP_LIBLDAP = $(LDAP_LIBADIR)/libldap/libldap.la
LDAP_LIBLBER = -llber
LDAP_LIBLDAP = -lldap
LDAP_LIBLDIF = -lldif
LDAP_LIBLUTIL = -llutil @LUTIL_LIBS@
LDAP_LIBLDBM = -lldbm @LDBM_LIBS@
LDAP_LIBLTHREAD = -llthread @LTHREAD_LIBS@
LDAP_LIBLBER_DEPEND = $(LDAP_LIBDIR)/liblber/liblber.la
LDAP_LIBLDAP_DEPEND = $(LDAP_LIBDIR)/libldap/libldap.la
LDAP_LIBLDIF_DEPEND = $(LDAP_LIBDIR)/libldif/libldif.a
LDAP_LIBLUTIL_DEPEND = $(LDAP_LIBDIR)/liblutil/liblutil.a
LDAP_LIBLDBM_DEPEND = $(LDAP_LIBDIR)/libldbm/libldbm.a
LDAP_LIBLTHREAD_DEPEND = $(LDAP_LIBDIR)/liblthread/liblthread.a
LDAP_LIBS = $(LDAP_LIBPATH) -lldif $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
LDAP_LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) \
$(LDAP_LIBLDIF) $(LDAP_LIBLUTIL)
LDAP_LIBDEPEND = $(LDAP_LIBLDAP_DEPEND) $(LDAP_LIBLBER_DEPEND) \
$(LDAP_LIBLDIF_DEPEND) $(LDAP_LIBLUTIL_DEPEND)
# AutoConfig generated
AC_CC = @CC@
AC_DEFS = @CPPFLAGS@ @DEFS@
AC_LIBS = @LDFLAGS@ @LIBS@
AC_CFLAGS = @CFLAGS@
AC_LDFLAGS =
AC_DEFS = @CPPFLAGS@ @DEFS@
AC_LDFLAGS = @LDFLAGS@
AC_LIBS = @LIBS@
KRB_LIBS = @KRB_LIBS@
TERMCAP_LIBS = @TERMCAP_LIBS@
LDAPD_LIBS = @LDAPD_LIBS@
SLAPD_LIBS = @SLAPD_LIBS@
SLURPD_LIBS = @SLURPD_LIBS@
# Our Defaults
CC = $(AC_CC)
DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS)
LIBS = $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
LDFLAGS = $(AC_LDFLAGS)
DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
LIBS = $(XLIBS) $(AC_LIBS) $(XXLIBS)
CFLAGS = $(AC_CFLAGS) $(DEFS)
LDFLAGS = $(AC_LDFLAGS) $(XLDFLAGS)
all: all-common all-local FORCE
install: install-common install-local FORCE

3
clients/fax500/Makefile.in
View File

@ -9,6 +9,9 @@ RPOBJS = rp500.o faxtotpc.o
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS)
rp500 : rpversion.o
$(LTLINK) -o $@ $(RPOBJS) rpversion.o $(LIBS)

3
clients/finger/Makefile.in
View File

@ -6,6 +6,9 @@ PROGRAMS= in.xfingerd
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS)
in.xfingerd : version.o
$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

5
clients/gopher/Makefile.in
View File

@ -11,7 +11,8 @@ GWOBJS = go500gw.o
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = -llutil @LUTIL_LIBS@
XLIBS = $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS)
go500 : goversion.o
$(LTLINK) -o $@ $(GOOBJS) goversion.o $(LIBS)
@ -40,4 +41,4 @@ install-local: $(PROGRAMS) go500gw.help FORCE
$(LTINSTALL) $(INSTALLFLAGS) -m 755 go500 $(libexecdir)
$(LTINSTALL) $(INSTALLFLAGS) -m 755 go500gw $(libexecdir)
-$(MV) $(datadir)/go500gw.help $(datadir)/go500gw.help-
$(INSTALL) $(INSTALLFLAGS) -m 644 go500gw.help $(datadir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/go500gw.help $(datadir)

3
clients/mail500/Makefile.in
View File

@ -7,6 +7,9 @@ OBJS= main.o
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS)
mail500 : version.o
$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

5
clients/rcpt500/Makefile.in
View File

@ -7,6 +7,9 @@ HDRS= rcpt500.h
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS)
rcpt500 : version.o
$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)
@ -22,4 +25,4 @@ install-local: $(PROGRAMS) rcpt500.help FORCE
-$(MKDIR) $(libexecdir) $(datadir)
$(LTINSTALL) $(INSTALLFLAGS) -m 755 rcpt500 $(libexecdir)
-$(MV) $(datadir)/rcpt500.help $(datadir)/rcpt500.help-
$(INSTALL) $(INSTALLFLAGS) -m 644 rcpt500.help $(datadir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/rcpt500.help $(datadir)

7
clients/tools/Makefile.in
View File

@ -4,11 +4,12 @@
SRCS = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c ldappasswd.c
OBJS = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o ldappasswd.o
XLIBS = $(KRB_LIBS)
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS)
XSRCS = ldsversion.c ldmversion.c lddversion.c ldrversion.c
PROGRAMS = ldapsearch ldapmodify ldapdelete ldapmodrdn ldapadd ldappasswd
@ -26,7 +27,7 @@ ldapmodrdn: ldrversion.o
$(LTLINK) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)
ldappasswd: ldappasswd.o
$(LTLINK) -o $@ ldappasswd.o $(LIBS) @LUTIL_LIBS@ $(LDAP_LIBPATH) -llutil
$(LTLINK) -o $@ ldappasswd.o $(LUTIL_LIBS) $(LIBS)
ldapadd: ldapmodify
$(RM) $@

3
clients/ud/Makefile.in
View File

@ -9,7 +9,8 @@ PROGRAMS= ud
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = $(TERMCAP_LIBS) $(KRB_LIBS)
XLIBS = $(LDAP_LIBS)
XXLIBS = $(TERMCAP_LIBS) $(KRB_LIBS)
ud : version.o
$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)

626
configure vendored
View File

File diff suppressed because it is too large Load Diff

21
configure.in
View File

@ -273,7 +273,8 @@ dnl
AC_CHECK_LIB(gen, main)
])
dnl Check for resolv
dnl Check for resolver routines
AC_CHECK_LIB(bind, res_search)
AC_CHECK_LIB(resolv, res_search)
dnl HP-UX requires -lV3
@ -448,7 +449,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
if test $ol_link_threads = no ; then
dnl try DEC Threads -lpthread -lexc
save_LIBS="$LIBS"
AC_CHECK_LIB(pthread, pthread_join, [
AC_CHECK_LIB(pthread, pthread_mutex_lock, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthread -lexc"
if test $ol_with_yielding_select = auto ; then
@ -461,7 +462,7 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
if test $ol_link_threads = no ; then
dnl try DEC Threads -lpthreads -lmach -lexc -lc_r
save_LIBS="$LIBS"
AC_CHECK_LIB(pthreads, pthread_join, [
AC_CHECK_LIB(pthreads, pthread_mutex_unlock, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads -lmach -lexc -lc_r"
if test $ol_with_yielding_select = auto ; then
@ -498,7 +499,18 @@ if test $ol_with_threads = auto -o $ol_with_threads = yes \
LIBS="$save_LIBS"
fi
dnl HP-UX 11 check
dnl IRIX Pthread check
if test $ol_link_threads = no ; then
dnl try IRIX Pthreads -Wl,-woff,85 -lpthreads
save_LIBS="$LIBS"
AC_CHECK_LIB(pthreads, pthread_join, [
ol_link_threads=posix
LTHREAD_LIBS="$LTHREAD_LIBS -lpthreads"
],[-Wl,-woff,85])
LIBS="$save_LIBS"
fi
dnl HP-UX 11 Pthread check
if test $ol_link_threads = no; then
save_LIBS="$LIBS"
LIBS="$LIBS -lpthread"
@ -1326,7 +1338,6 @@ AC_SUBST(BUILD_SLAPD)
AC_SUBST(BUILD_SHELL)
AC_SUBST(BUILD_SLURPD)
AC_SUBST(LDAP_LIBS)
AC_SUBST(LDAPD_LIBS)
AC_SUBST(SLAPD_LIBS)

10
include/Makefile.in
View File

@ -7,12 +7,12 @@ all-local: ldapconfig.h FORCE
install-local: FORCE
-$(MKDIR) -p $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 ldap_cdefs.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/lber.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldap_cdefs.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/disptmpl.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/srchpref.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 ldap_features.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 disptmpl.h $(includedir)
$(INSTALL) $(INSTALLFLAGS) -m 644 srchpref.h $(includedir)
clean-local: FORCE
$(RM) ldapconfig.h

12
include/portable.h.in
View File

@ -92,14 +92,26 @@
#undef WORDS_BIGENDIAN
/* define this if needed to get reentrant functions */
#ifndef REENTRANT
#undef REENTRANT
#endif
#ifndef _REENTRANT
#undef _REENTRANT
#endif
/* define this if needed to get threadsafe functions */
#ifndef THREADSAFE
#undef THREADSAFE
#endif
#ifndef _THREADSAFE
#undef _THREADSAFE
#endif
#ifndef THREAD_SAFE
#undef THREAD_SAFE
#endif
#ifndef _THREAD_SAFE
#undef _THREAD_SAFE
#endif
/* define this if cross compiling */
#undef CROSS_COMPILING

2
libraries/libavl/Makefile.in
View File

@ -13,4 +13,4 @@ LIBRARY = libavl.a
PROGRAMS = testavl
testavl: $(LIBRARY) testavl.o
$(LTLINK) $(LDFLAGS) -o $@ testavl.o $(LDAP_LIBPATH) -lavl
$(LTLINK) $(LDFLAGS) -o $@ testavl.o $(LDAP_LIBPATH) -lavl $(LIBS)

2
libraries/liblber/Makefile.in
View File

@ -16,7 +16,7 @@ PROGRAMS= dtest etest idtest
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLBER) $(AC_LIBS)
XXLIBS = $(LDAP_LIBPATH) $(LDAP_LIBLBER)
dtest: $(LIBRARY) dtest.o
$(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)

10
libraries/libldap/Makefile.in
View File

@ -28,7 +28,7 @@ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)
XXLIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
apitest: $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
$(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
@ -46,14 +46,14 @@ install-local: $(CFFILES) FORCE
@for i in $(CFFILES); do \
if test ! -f $(sysconfdir)/$$i; then \
echo "installing $$i in $(sysconfdir)"; \
echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \
echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i"; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i; \
else \
echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
fi; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i.default; \
done
-$(MKDIR) $(datadir)
-$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
$(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly
$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(datadir)/ldapfriendly

2
libraries/libldap_r/Makefile.in
View File

@ -27,7 +27,7 @@ LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)
XXLIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER)
.links : FORCE
@for i in $(XXSRCS); do \

2
libraries/libldbm/Makefile.in
View File

@ -10,7 +10,7 @@ OBJS = ldbm.o
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = @LDBM_LIBS@ -lavl
XXLIBS = $(LDBM_LIBS) -lavl
testldbm: libldbm.a testldbm.o
$(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS)

2
libraries/liblthread/Makefile.in
View File

@ -10,6 +10,6 @@ OBJS = rdwr.o thread.o stack.o
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
XLIBS = @LTHREAD_LIBS@
XLIBS = $(LTHREAD_LIBS)

2
servers/ldapd/Makefile.in
View File

@ -18,7 +18,7 @@ LDAP_LIBDIR= ../../libraries
BUILD_OPT = "--enable-ldapd"
BUILD_SRV = @BUILD_LDAPD@
XLIBS= @LDAPD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@
XLIBS= $(LDAPD_LIBS) $(KRB_LIBS) $(LUTIL_LIBS)
ldapd: version.o
$(LDLINK) -o $@ $(OBJS) version.o $(LIBS)

11
servers/slapd/Makefile.in
View File

@ -22,6 +22,11 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
# $(LTHREAD_LIBS) must be last!
XLIBS = libbackends.a $(SLAPD_LIBS) $(LDAP_LIBS) \
-lavl $(LDAP_LIBLDBM)
XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD)
BUILD_OPT = "--enable-slapd"
BUILD_SRV = @BUILD_SLAPD@
@ -30,10 +35,6 @@ all-local-srv: FORCE
$(MAKE) $(MFLAGS) slapd
(cd tools; $(MAKE) $(MFLAGS) all)
XLIBS = @SLAPD_LIBS@ libbackends.a \
-lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
$(KRB_LIBS) -llutil @LUTIL_LIBS@
slapd: version.o
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
@ -115,7 +116,7 @@ install-conf: FORCE
@-$(MKDIR) $(sysconfdir)
@for i in $(CFFILES); do \
tmpcf=/tmp/$$i.$$ ; \
$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $$i > $$tmpcf ; \
$(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' $(srcdir)/$$i > $$tmpcf ; \
if test ! -f $(sysconfdir)/$$i; then \
echo "installing $$i in $(sysconfdir)"; \
echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$tmpcf $(sysconfdir)/$$i"; \

8
servers/slapd/back-shell/shell.h
View File

@ -20,11 +20,13 @@ struct shellinfo {
};
struct backend;
struct conn;
struct op;
struct slap_conn;
struct slap_op;
extern int forkandexec LDAP_P((char **args, FILE **rfp, FILE **wfp));
extern void print_suffixes LDAP_P((FILE *fp, struct backend *be));
extern int read_and_send_results LDAP_P((struct backend *be, struct conn *conn, struct op *op, FILE *fp, char **attrs, int attrsonly));
extern int read_and_send_results LDAP_P((struct backend *be,
struct slap_conn *conn, struct slap_op *op,
FILE *fp, char **attrs, int attrsonly));
LDAP_END_DECL

13
servers/slapd/tools/Makefile.in
View File

@ -18,6 +18,9 @@ BUILD_LDBM = @BUILD_LDBM@
LDAP_INCDIR= ../../../include
LDAP_LIBDIR= ../../../libraries
XLIBS = $(LDAP_LIBS) $(SLAPD_LIBS) -lavl $(LDAP_LIBLDBM)
XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD)
PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry \
ldif2id2children centipede ldbmtest ldif
@ -46,9 +49,6 @@ build-ldbm: FORCE
ldbm-tools: $(PROGRAMS)
XLIBS = @SLAPD_LIBS@ -lavl -lldbm @LDBM_LIBS@ -llthread @LTHREAD_LIBS@ \
$(KRB_LIBS) -llutil @LUTIL_LIBS@
build-edb2ldif: FORCE
@if [ "$(HAVE_ISODE)" = "yes" ]; then \
$(MAKE) $(MFLAGS) edb2ldif; \
@ -93,14 +93,13 @@ ldbmcat: ldbmcat.o
$(LTLINK) -o $@ ldbmcat.o $(LIBS)
ldif: ldif.o
$(LTLINK) -o $@ ldif.o $(LIBS) $(LIBS2)
$(LTLINK) -o $@ ldif.o $(LIBS)
centipede: centipede.o
$(LTLINK) -o $@ centipede.o $(LIBS) $(KRBLIBFLAG) $(KRBLIBS)
$(LTLINK) -o $@ centipede.o $(LIBS)
sizecount: sizecount.o ../phonetic.o ../ch_malloc.o
$(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o \
$(LIBS) $(KRBLIBFLAG) $(KRBLIBS)
$(LTLINK) -o $@ sizecount.o ../phonetic.o ../ch_malloc.o $(LIBS)
ldbmtest: ldbmtest.o ../libbackends.a $(OBJS2)
$(LTLINK) -o ldbmtest ldbmtest.o $(OBJS2) ../libbackends.a $(LIBS)

6
servers/slurpd/Makefile.in
View File

@ -24,7 +24,9 @@ BUILD_SRV = @BUILD_SLURPD@
all-local-srv: slurpd
XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@ $(KRB_LIBS) -llutil @LUTIL_LIBS@
# $(LTHREAD_LIBS) must be last!
XLIBS = $(SLURPD_LIBS) $(LDAP_LIBS)
XXLIBS = $(KRB_LIBS) $(LDAP_LIBLTHREAD)
slurpd: version.o
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
@ -32,7 +34,7 @@ slurpd: version.o
sslurpd: version.o
$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
version.c: $(OBJS) $(LDAP_LIBDEPEND)
version.c: $(OBJS) $(LDAP_LIBDEPEND) $(LDAP_LIBTHREAD_DEPEND)
$(RM) $@
(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \

9
tests/Makefile.in
View File

@ -3,17 +3,16 @@
##
## tests Makefile.in for OpenLDAP
SCRIPTSDIR=./scripts
all-local: FORCE
@-$(LN_S) $(srcdir)/data .
@echo "Initiating LDAP tests..."; \
$(MKDIR) -p test-db test-repl ; \
$(SCRIPTSDIR)/all $(SCRIPTSDIR)
$(MKDIR) test-db test-repl ; \
$(srcdir)/scripts/all $(srcdir)
clean-local: FORCE
$(RM) test-db/[!C]* test-repl/[!C]* *core
veryclean-local: FORCE
$(RM) data
$(RM) -r test-db test-repl

13
tests/scripts/all
View File

@ -3,15 +3,16 @@
echo ">>>>> Executing all LDAP tests..."
if [ $# -eq 0 ]; then
SCRIPTDIR="."
SRCDIR="."
else
SCRIPTDIR=$1; shift
SRCDIR=$1; shift
fi
for i in $SCRIPTDIR/test*; do
CMD=$i $*
echo ">>>>> Starting $CMD ..."
$CMD
echo ">>>>> Test Directory: $SRCDIR"
for CMD in $SRCDIR/scripts/test*; do
echo ">>>>> Starting `basename $CMD` ..."
$CMD $SRCDIR
RC=$?
if [ $RC -eq 0 ]; then
echo ">>>>> $CMD completed OK."

28
tests/scripts/defines.sh
View File

@ -1,3 +1,5 @@
DATADIR=$SRCDIR/data
LDIF2LDBM=../servers/slapd/tools/ldif2ldbm
SLAPD=../servers/slapd/slapd
SLURPD=../servers/slurpd/slurpd
@ -8,12 +10,12 @@ PORT=9009
SLAVEPORT=9010
DBDIR=./test-db
REPLDIR=./test-repl
CONF=./data/slapd-master.conf
ACLCONF=./data/slapd-acl.conf
MASTERCONF=./data/slapd-repl-master.conf
SLAVECONF=./data/slapd-repl-slave.conf
LDIF=./data/test.ldif
LDIFORDERED=./data/test-ordered.ldif
CONF=$DATADIR/slapd-master.conf
ACLCONF=$DATADIR/slapd-acl.conf
MASTERCONF=$DATADIR/slapd-repl-master.conf
SLAVECONF=$DATADIR/slapd-repl-slave.conf
LDIF=$DATADIR/test.ldif
LDIFORDERED=$DATADIR/test-ordered.ldif
BASEDN="o=University of Michigan, c=US"
MANAGERDN="cn=Manager, o=University of Michigan, c=US"
PASSWD=secret
@ -29,10 +31,10 @@ LDIFFLT=$DBDIR/ldif.flt
MASTEROUT=$DBDIR/master.out
SLAVEOUT=$DBDIR/slave.out
TESTOUT=$DBDIR/ldapsearch.out
SEARCHOUTMASTER=./data/search.out.master
MODIFYOUTMASTER=./data/modify.out.master
ADDDELOUTMASTER=./data/adddel.out.master
MODRDNOUTMASTER=./data/modrdn.out.master
ACLOUTMASTER=./data/acl.out.master
REPLOUTMASTER=./data/repl.out.master
MODSRCHFILTERS=./data/modify.search.filters
SEARCHOUTMASTER=$DATADIR/search.out.master
MODIFYOUTMASTER=$DATADIR/modify.out.master
ADDDELOUTMASTER=$DATADIR/adddel.out.master
MODRDNOUTMASTER=$DATADIR/modrdn.out.master
ACLOUTMASTER=$DATADIR/acl.out.master
REPLOUTMASTER=$DATADIR/repl.out.master
MODSRCHFILTERS=$DATADIR/modify.search.filters

11
tests/scripts/test001-ldif2ldbm
View File

@ -1,7 +1,16 @@
#!/bin/sh
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
echo "running defines.sh $SRCDIR"
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "Datadir is $DATADIR"
echo "Cleaning up in $DBDIR..."

11
tests/scripts/test001-slapadd
View File

@ -1,7 +1,16 @@
#!/bin/sh
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
echo "running defines.sh $SRCDIR"
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "Datadir is $DATADIR"
echo "Cleaning up in $DBDIR..."

11
tests/scripts/test002-populate
View File

@ -1,7 +1,12 @@
#!/bin/sh
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "Cleaning up in $DBDIR..."
@ -45,9 +50,9 @@ if [ $RC != 0 ]; then
fi
echo "Filtering ldapsearch results..."
. scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
. scripts/acfilter.sh < $LDIF > $LDIFFLT
. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
echo "Comparing filter output..."
cmp $SEARCHFLT $LDIFFLT

8
tests/scripts/test003-search
View File

@ -1,6 +1,12 @@
#!/bin/sh
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "Cleaning up in $DBDIR..."

8
tests/scripts/test004-modify
View File

@ -1,6 +1,12 @@
#!/bin/sh
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "Cleaning up in $DBDIR..."

9
tests/scripts/test005-modrdn
View File

@ -1,5 +1,12 @@
#!/bin/sh
echo "modrdn test not yet written"
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "modrdn test not yet written"
exit 0

10
tests/scripts/test006-acls
View File

@ -1,6 +1,12 @@
#!/bin/sh
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
. $SRCDIR/scripts/defines.sh $SRCDIR
echo "Cleaning up in $DBDIR..."
@ -96,7 +102,7 @@ EOMODS4
echo "Using ldapsearch to retrieve all the entries..."
$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
'objectClass=*' | . scripts/acfilter.sh >> $SEARCHOUT 2>&1
'objectClass=*' | . $SRCDIR/scripts/acfilter.sh >> $SEARCHOUT 2>&1
RC=$?
kill -HUP $PID
if [ $RC != 0 ]; then

8
tests/scripts/test007-replication
View File

@ -10,7 +10,13 @@
# - retrieve database over ldap and compare against expected results
#
. scripts/defines.sh
if [ $# -eq 0 ]; then
SRCDIR="."
else
SRCDIR=$1; shift
fi
. $SRCDIR/scripts/defines.sh $SRCDIR
if test ! -x $SLURPD ; then
echo ">>>>> $SLURPD is not executable or do not exist."