upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9235 Merge libldap_r into libldap

Browse source
This commit is contained in:
Quanah Gibson-Mount 2020-05-13 16:54:50 +00:00 committed by Ryan Tandy
parent 5bf16496e4
commit c06ac436e2
68 changed files with 61 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
.gitignore vendored
View file

@ -68,76 +68,6 @@ Makefile
/include/ldap_features.h /include/ldap_features.h
/include/portable.h /include/portable.h
libraries/libl*/*test libraries/libl*/*test
libraries/libldap_r/abandon.c
libraries/libldap_r/add.c
libraries/libldap_r/addentry.c
libraries/libldap_r/apitest
libraries/libldap_r/apitest.c
libraries/libldap_r/assertion.c
libraries/libldap_r/bind.c
libraries/libldap_r/cancel.c
libraries/libldap_r/charray.c
libraries/libldap_r/compare.c
libraries/libldap_r/controls.c
libraries/libldap_r/cyrus.c
libraries/libldap_r/dds.c
libraries/libldap_r/delete.c
libraries/libldap_r/deref.c
libraries/libldap_r/dnssrv.c
libraries/libldap_r/error.c
libraries/libldap_r/extended.c
libraries/libldap_r/fetch.c
libraries/libldap_r/filter.c
libraries/libldap_r/free.c
libraries/libldap_r/getattr.c
libraries/libldap_r/getdn.c
libraries/libldap_r/getentry.c
libraries/libldap_r/getvalues.c
libraries/libldap_r/init.c
libraries/libldap_r/lbase64.c
libraries/libldap_r/ldap_sync.c
libraries/libldap_r/ldif.c
libraries/libldap_r/ldifutil.c
libraries/libldap_r/ltest
libraries/libldap_r/messages.c
libraries/libldap_r/modify.c
libraries/libldap_r/modrdn.c
libraries/libldap_r/msctrl.c
libraries/libldap_r/open.c
libraries/libldap_r/options.c
libraries/libldap_r/os-ip.c
libraries/libldap_r/os-local.c
libraries/libldap_r/pagectrl.c
libraries/libldap_r/passwd.c
libraries/libldap_r/ppolicy.c
libraries/libldap_r/print.c
libraries/libldap_r/psearchctrl.c
libraries/libldap_r/references.c
libraries/libldap_r/request.c
libraries/libldap_r/result.c
libraries/libldap_r/sasl.c
libraries/libldap_r/sbind.c
libraries/libldap_r/schema.c
libraries/libldap_r/search.c
libraries/libldap_r/sort.c
libraries/libldap_r/sortctrl.c
libraries/libldap_r/stctrl.c
libraries/libldap_r/string.c
libraries/libldap_r/test.c
libraries/libldap_r/tls2.c
libraries/libldap_r/tls_g.c
libraries/libldap_r/tls_m.c
libraries/libldap_r/tls_o.c
libraries/libldap_r/turn.c
libraries/libldap_r/txn.c
libraries/libldap_r/unbind.c
libraries/libldap_r/url.c
libraries/libldap_r/utf-8-conv.c
libraries/libldap_r/utf-8.c
libraries/libldap_r/util-int.c
libraries/libldap_r/vc.c
libraries/libldap_r/vlvctrl.c
libraries/libldap_r/whoami.c
libraries/liblunicode/ucdata.c libraries/liblunicode/ucdata.c
libraries/liblunicode/ucdata.h libraries/liblunicode/ucdata.h
libraries/liblunicode/ucgendat libraries/liblunicode/ucgendat

3
build/top.mk
View file

@ -166,7 +166,6 @@ WT_LIBS = @WT_LIBS@
LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la
LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la
LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la
LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a
LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a
@ -175,7 +174,7 @@ LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a
LDAP_L = $(LDAP_LIBLUTIL_A) \ LDAP_L = $(LDAP_LIBLUTIL_A) \
$(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \ SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \
$(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
WRAP_LIBS = @WRAP_LIBS@ WRAP_LIBS = @WRAP_LIBS@
# AutoConfig generated # AutoConfig generated

1
configure.in
View file

@ -3079,7 +3079,6 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk]
[libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk] [libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk]
[libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk] [libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk]
[libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk] [libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk]
[libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk]
[libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk] [libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk]
[libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk] [libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk]
[libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk] [libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk]

2
contrib/slapd-modules/acl/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/addpartial/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/adremap/Makefile
View file

@ -13,7 +13,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/allop/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/allowed/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/authzid/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/autogroup/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/cloak/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/comp_match/Makefile
View file

@ -18,7 +18,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
SNACC_DIR = ../$(LDAP_SRC)/snacc SNACC_DIR = ../$(LDAP_SRC)/snacc

2
contrib/slapd-modules/denyop/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/dsaschema/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/dupent/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/kinit/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/lastbind/Makefile
View file

@ -13,7 +13,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/lastmod/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/noopsrch/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/nops/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/nssov/Makefile
View file

@ -20,7 +20,7 @@ LDAP_SRC=../../..
LDAP_BUILD=$(LDAP_SRC) LDAP_BUILD=$(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
NLDAPD_INC=-Inss-pam-ldapd NLDAPD_INC=-Inss-pam-ldapd

2
contrib/slapd-modules/passwd/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/passwd/argon2/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../../.. LDAP_SRC = ../../../..
LDAP_BUILD = ../../../.. LDAP_BUILD = ../../../..
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/passwd/pbkdf2/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../../.. LDAP_SRC = ../../../..
LDAP_BUILD = ../../../.. LDAP_BUILD = ../../../..
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/passwd/sha2/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../../.. LDAP_SRC = ../../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/passwd/totp/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../../.. LDAP_SRC = ../../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/proxyOld/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/samba4/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/smbk5pwd/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
SSL_INC = SSL_INC =

2
contrib/slapd-modules/trace/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/usn/Makefile
View file

@ -3,7 +3,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

2
contrib/slapd-modules/vc/Makefile
View file

@ -15,7 +15,7 @@
LDAP_SRC = ../../.. LDAP_SRC = ../../..
LDAP_BUILD = $(LDAP_SRC) LDAP_BUILD = $(LDAP_SRC)
LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \ LDAP_LIB = $(LDAP_BUILD)/libraries/libldap/libldap.la \
$(LDAP_BUILD)/libraries/liblber/liblber.la $(LDAP_BUILD)/libraries/liblber/liblber.la
LIBTOOL = $(LDAP_BUILD)/libtool LIBTOOL = $(LDAP_BUILD)/libtool

1
doc/man/man3/ldap_dup.3
View file

@ -46,7 +46,6 @@ and
functions are used in conjunction with a "thread safe" version functions are used in conjunction with a "thread safe" version
of of
.B libldap .B libldap
.RB ( libldap_r )
to enable operation thread safe API calls, so that a single session to enable operation thread safe API calls, so that a single session
may be simultaneously used across multiple threads with consistent may be simultaneously used across multiple threads with consistent
error handling. error handling.

2
include/ldap_pvt_thread.h
View file

@ -15,7 +15,7 @@
*/ */
#ifndef _LDAP_PVT_THREAD_H #ifndef _LDAP_PVT_THREAD_H
#define _LDAP_PVT_THREAD_H /* libldap_r/ldap_thr_debug.h #undefines this */ #define _LDAP_PVT_THREAD_H /* libldap/ldap_thr_debug.h #undefines this */
#include "ldap_cdefs.h" #include "ldap_cdefs.h"
#include "ldap_int_thread.h" #include "ldap_int_thread.h"

2
libraries/Makefile.in
View file

@ -17,6 +17,6 @@ SUBDIRS= \
liblutil \ liblutil \
liblber \ liblber \
liblunicode \ liblunicode \
libldap libldap_r \ libldap \
librewrite librewrite

8
libraries/libldap/Makefile.in
View file

@ -29,7 +29,8 @@ SRCS = bind.c open.c result.c error.c compare.c search.c \
tls2.c tls_o.c tls_g.c \ tls2.c tls_o.c tls_g.c \
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
assertion.c deref.c ldifutil.c ldif.c fetch.c lbase64.c \ assertion.c deref.c ldifutil.c ldif.c fetch.c lbase64.c \
msctrl.c psearchctrl.c msctrl.c psearchctrl.c threads.c rdwr.c tpool.c rq.c \
thr_posix.c thr_thr.c thr_nt.c thr_pth.c thr_stub.c thr_debug.c
OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
controls.lo messages.lo references.lo extended.lo cyrus.lo \ controls.lo messages.lo references.lo extended.lo cyrus.lo \
@ -43,12 +44,13 @@ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
tls2.lo tls_o.lo tls_g.lo \ tls2.lo tls_o.lo tls_g.lo \
turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
assertion.lo deref.lo ldifutil.lo ldif.lo fetch.lo lbase64.lo \ assertion.lo deref.lo ldifutil.lo ldif.lo fetch.lo lbase64.lo \
msctrl.lo psearchctrl.lo msctrl.lo psearchctrl.lo threads.lo rdwr.lo tpool.lo rq.lo \
thr_posix.lo thr_thr.lo thr_nt.lo thr_pth.lo thr_stub.lo thr_debug.lo
LDAP_INCDIR= ../../include LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
LIB_DEFS = -DLDAP_LIBRARY LIB_DEFS = -DLDAP_LIBRARY -DLDAP_R_COMPILE
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A) XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)

4
libraries/libldap_r/ldap_thr_debug.h → libraries/libldap/ldap_thr_debug.h
View file

@ -17,7 +17,7 @@
#ifdef LDAP_THREAD_DEBUG #ifdef LDAP_THREAD_DEBUG
/* /*
* libldap_r .c files should include this file after ldap_pvt_thread.h, * libldap .c files should include this file after ldap_pvt_thread.h,
* with the appropriate LDAP_THREAD*_IMPLEMENTATION macro(s) defined. * with the appropriate LDAP_THREAD*_IMPLEMENTATION macro(s) defined.
*/ */
@ -50,7 +50,7 @@
* include/ldap_<int,pvt>_thread.h also do some thr_debug magic. * include/ldap_<int,pvt>_thread.h also do some thr_debug magic.
* *
* So, * So,
* libldap_r/<not thr_debug.c> thus define ldap_int_thread_*() instead * libldap/<not thr_debug.c> thus define ldap_int_thread_*() instead
* of ldap_pvt_thread_*(). * of ldap_pvt_thread_*().
* thr_debug.c defines the ldap_pvt_*() and ldap_debug_*() functions. * thr_debug.c defines the ldap_pvt_*() and ldap_debug_*() functions.
* In thread.c, ldap_pvt_thread_<initialize/destroy>() will call * In thread.c, ldap_pvt_thread_<initialize/destroy>() will call

0
libraries/libldap_r/rdwr.c → libraries/libldap/rdwr.c
View file

0
libraries/libldap_r/rq.c → libraries/libldap/rq.c
View file

2
libraries/libldap_r/thr_debug.c → libraries/libldap/thr_debug.c
View file

@ -673,7 +673,7 @@ ldap_debug_thread_initialize( void )
for( i = rc2 = 0; i < Idx_max; i++ ) for( i = rc2 = 0; i < Idx_max; i++ )
rc2 |= ldap_int_thread_mutex_init( &resource_mutexes[i] ); rc2 |= ldap_int_thread_mutex_init( &resource_mutexes[i] );
assert( rc2 == 0 ); assert( rc2 == 0 );
/* FIXME: Only for static libldap_r as in init.c? If so, why? */ /* FIXME: Only for static libldap as in init.c? If so, why? */
atexit( count_resource_leaks ); atexit( count_resource_leaks );
} }
} }

0
libraries/libldap_r/thr_nt.c → libraries/libldap/thr_nt.c
View file

0
libraries/libldap_r/thr_posix.c → libraries/libldap/thr_posix.c
View file

0
libraries/libldap_r/thr_pth.c → libraries/libldap/thr_pth.c
View file

0
libraries/libldap_r/thr_stub.c → libraries/libldap/thr_stub.c
View file

0
libraries/libldap_r/thr_thr.c → libraries/libldap/thr_thr.c
View file

0
libraries/libldap_r/threads.c → libraries/libldap/threads.c
View file

0
libraries/libldap_r/tpool.c → libraries/libldap/tpool.c
View file

90
libraries/libldap_r/Makefile.in
View file

@ -1,90 +0,0 @@
# Makefile.in for LDAP -lldap
# $OpenLDAP$
## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##
## Copyright 1998-2020 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
## modification, are permitted only as authorized by the OpenLDAP
## Public License.
##
## A copy of this license is available in the file LICENSE in the
## top-level directory of the distribution or, alternatively, at
## <http://www.OpenLDAP.org/license.html>.
LIBRARY = libldap_r.la
PROGRAMS = apitest ltest
XXDIR = $(srcdir)/../libldap
XXSRCS = apitest.c test.c \
bind.c open.c result.c error.c compare.c search.c \
controls.c messages.c references.c extended.c cyrus.c \
modify.c add.c modrdn.c delete.c abandon.c \
sasl.c sbind.c unbind.c cancel.c \
filter.c free.c sort.c passwd.c whoami.c vc.c \
getdn.c getentry.c getattr.c getvalues.c addentry.c \
request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \
init.c options.c print.c string.c util-int.c schema.c \
charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
tls2.c tls_o.c tls_g.c \
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
assertion.c deref.c ldifutil.c ldif.c fetch.c lbase64.c \
msctrl.c psearchctrl.c
SRCS = threads.c rdwr.c tpool.c rq.c \
thr_posix.c thr_thr.c thr_nt.c \
thr_pth.c thr_stub.c thr_debug.c
OBJS = threads.lo rdwr.lo tpool.lo rq.lo \
thr_posix.lo thr_thr.lo thr_nt.lo \
thr_pth.lo thr_stub.lo thr_debug.lo \
bind.lo open.lo result.lo error.lo compare.lo search.lo \
controls.lo messages.lo references.lo extended.lo cyrus.lo \
modify.lo add.lo modrdn.lo delete.lo abandon.lo \
sasl.lo sbind.lo unbind.lo cancel.lo \
filter.lo free.lo sort.lo passwd.lo whoami.lo vc.lo \
getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \
init.lo options.lo print.lo string.lo util-int.lo schema.lo \
charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
tls2.lo tls_o.lo tls_g.lo \
turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
assertion.lo deref.lo ldifutil.lo ldif.lo fetch.lo lbase64.lo \
msctrl.lo psearchctrl.lo
LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries
LIB_DEFS = -DLDAP_LIBRARY
XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
XXXLIBS = $(LTHREAD_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
.links : Makefile
@for i in $(XXSRCS); do \
$(RM) $$i ; \
$(LN_S) $(XXDIR)/$$i . ; \
done
touch .links
$(XXSRCS) : .links
clean-local: FORCE
@$(RM) .links
depend-common: .links
apitest: $(XLIBS) apitest.o
$(LTLINK) -o $@ apitest.o $(LIBS)
ltest: $(XLIBS) test.o
$(LTLINK) -o $@ test.o $(LIBS)
install-local: $(CFFILES) FORCE
-$(MKDIR) $(DESTDIR)$(libdir)
$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
$(LTFINISH) $(DESTDIR)$(libdir)

2
libraries/librewrite/Makefile.in
View file

@ -29,7 +29,7 @@ LDAP_LIBDIR= ../../libraries
LIBRARY = librewrite.a LIBRARY = librewrite.a
PROGRAMS = rewrite PROGRAMS = rewrite
XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \ XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \
$(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
XXXLIBS = $(LTHREAD_LIBS) XXXLIBS = $(LTHREAD_LIBS)

2
servers/slapd/Makefile.in
View file

@ -104,7 +104,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
# symbols that are imported from other DLLs). The set of symbols to # symbols that are imported from other DLLs). The set of symbols to
# export INCLUDES symbols from all static libraries that slapd gets # export INCLUDES symbols from all static libraries that slapd gets
# linked with, e.g. avl, lunicode, lutil, etc. This list # linked with, e.g. avl, lunicode, lutil, etc. This list
# will also include liblber and libldap_r if they were built as static # will also include liblber and libldap if they were built as static
# libraries. ALSO included will be symbols from other STATIC libraries # libraries. ALSO included will be symbols from other STATIC libraries
# outside the domain of the OpenLDAP source tree, e.g. regex, ltdl, # outside the domain of the OpenLDAP source tree, e.g. regex, ltdl,
# crypto, ssl, sasl, etc. (If these libraries are dynamic, we won't want # crypto, ssl, sasl, etc. (If these libraries are dynamic, we won't want

2
servers/slapd/back-asyncmeta/Makefile.in
View file

@ -35,7 +35,7 @@ BUILD_MOD = @BUILD_ASYNCMETA@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_ASYNCMETA@_DEFS) MOD_DEFS = $(@BUILD_ASYNCMETA@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(LIBS) $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(LIBS) $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-dnssrv/Makefile.in
View file

@ -30,7 +30,7 @@ BUILD_MOD = @BUILD_DNSSRV@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_DNSSRV@_DEFS) MOD_DEFS = $(@BUILD_DNSSRV@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-ldap/Makefile.in
View file

@ -29,7 +29,7 @@ BUILD_MOD = @BUILD_LDAP@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_LDAP@_DEFS) MOD_DEFS = $(@BUILD_LDAP@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-ldif/Makefile.in
View file

@ -25,7 +25,7 @@ BUILD_MOD = yes
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(yes_DEFS) MOD_DEFS = $(yes_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-mdb/Makefile.in
View file

@ -38,7 +38,7 @@ mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_MDB@_DEFS) MOD_DEFS = $(@BUILD_MDB@_DEFS)
MOD_LIBS = $(MDB_LIBS) MOD_LIBS = $(MDB_LIBS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-meta/Makefile.in
View file

@ -29,7 +29,7 @@ BUILD_MOD = @BUILD_META@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_META@_DEFS) MOD_DEFS = $(@BUILD_META@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-monitor/Makefile.in
View file

@ -33,7 +33,7 @@ BUILD_MOD = @BUILD_MONITOR@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_MONITOR@_DEFS) MOD_DEFS = $(@BUILD_MONITOR@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-ndb/Makefile.in
View file

@ -33,7 +33,7 @@ mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_NDB@_DEFS) MOD_DEFS = $(@BUILD_NDB@_DEFS)
MOD_LIBS = $(SLAPD_NDB_LIBS) MOD_LIBS = $(SLAPD_NDB_LIBS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-null/Makefile.in
View file

@ -25,7 +25,7 @@ BUILD_MOD = @BUILD_NULL@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_NULL@_DEFS) MOD_DEFS = $(@BUILD_NULL@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-passwd/Makefile.in
View file

@ -25,7 +25,7 @@ BUILD_MOD = @BUILD_PASSWD@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_PASSWD@_DEFS) MOD_DEFS = $(@BUILD_PASSWD@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-perl/Makefile.in
View file

@ -30,7 +30,7 @@ mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_PERL@_DEFS) MOD_DEFS = $(@BUILD_PERL@_DEFS)
MOD_LIBS = @MOD_PERL_LDFLAGS@ MOD_LIBS = @MOD_PERL_LDFLAGS@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-relay/Makefile.in
View file

@ -25,7 +25,7 @@ BUILD_MOD = @BUILD_RELAY@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_RELAY@_DEFS) MOD_DEFS = $(@BUILD_RELAY@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)

2
servers/slapd/back-shell/Makefile.in
View file

@ -27,7 +27,7 @@ BUILD_MOD = @BUILD_SHELL@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_SHELL@_DEFS) MOD_DEFS = $(@BUILD_SHELL@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-sock/Makefile.in
View file

@ -31,7 +31,7 @@ BUILD_MOD = @BUILD_SOCK@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_SOCK@_DEFS) MOD_DEFS = $(@BUILD_SOCK@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/back-sql/Makefile.in
View file

@ -29,7 +29,7 @@ BUILD_MOD = @BUILD_SQL@
mod_DEFS = -DSLAPD_IMPORT mod_DEFS = -DSLAPD_IMPORT
MOD_DEFS = $(@BUILD_SQL@_DEFS) MOD_DEFS = $(@BUILD_SQL@_DEFS)
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(SLAPD_SQL_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(SLAPD_SQL_LIBS)

2
servers/slapd/back-wt/Makefile.in
View file

@ -38,7 +38,7 @@ MOD_DEFS = @WT_INCS@
MOD_LIBS = @WT_LIBS@ MOD_LIBS = @WT_LIBS@
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

2
servers/slapd/overlays/Makefile.in
View file

@ -49,7 +49,7 @@ LDAP_LIBDIR= ../../../libraries
MOD_DEFS = -DSLAPD_IMPORT MOD_DEFS = -DSLAPD_IMPORT
shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) shared_LDAP_LIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)

5
tests/progs/Makefile.in
View file

@ -25,9 +25,8 @@ LDAP_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries
XLIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA) XLIBS = $(LDAP_LIBLDAP_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA)
XRLIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLUTIL_A) $(LDAP_LIBLBER_LA)
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
RLIBS = $(XRLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS) RLIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
OBJS = slapd-common.o OBJS = slapd-common.o
@ -61,6 +60,6 @@ slapd-bind: slapd-bind.o $(OBJS) $(XLIBS)
ldif-filter: ldif-filter.o $(XLIBS) ldif-filter: ldif-filter.o $(XLIBS)
$(LTLINK) -o $@ ldif-filter.o $(LIBS) $(LTLINK) -o $@ ldif-filter.o $(LIBS)
slapd-mtread: slapd-mtread.o $(OBJS) $(XRLIBS) slapd-mtread: slapd-mtread.o $(OBJS) $(XLIBS)
$(LTLINK) -o $@ slapd-mtread.o $(OBJS) $(RLIBS) $(LTLINK) -o $@ slapd-mtread.o $(OBJS) $(RLIBS)