ITS#9235 Merge libldap_r into libldap

diff --git a/.gitignore b/.gitignore
index 5baf6ba863f579135e4556bd75351201a874340f..0f8012c05a264a852c447a7dce825ac170928f15 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -68,76 +68,6 @@ Makefile
 /include/ldap_features.h
 /include/portable.h
 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.h
 libraries/liblunicode/ucgendat

diff --git a/build/top.mk b/build/top.mk
index 7aed7a85f8a5cf99af0c768043d8ef335957fb07..264b4bab2eb1f95286645650054efc9a91e1b62b 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -166,7 +166,6 @@ WT_LIBS = @WT_LIBS@
 
 LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.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_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_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
 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@
 # AutoConfig generated 

diff --git a/configure.in b/configure.in
index 118fffae8512fc97cac460159979cb324802d5fa..fbbeaa67ee1e1529ee8dbf9ccc4b1a846258c6b7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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/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_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/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]

diff --git a/contrib/slapd-modules/acl/Makefile b/contrib/slapd-modules/acl/Makefile
index 40a8e9ecca254ea2343ca99ce11252dc35fb6155..a67ca242bc034db8ff083b12a0bb5f915ee0e5cc 100644 (file)
--- a/contrib/slapd-modules/acl/Makefile
+++ b/contrib/slapd-modules/acl/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/addpartial/Makefile b/contrib/slapd-modules/addpartial/Makefile
index a999d7ffe2e583b52536be49b739082027a341bc..1994f0de7a3ae51ef2687553cd32fd02fd3e5c42 100644 (file)
--- a/contrib/slapd-modules/addpartial/Makefile
+++ b/contrib/slapd-modules/addpartial/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/adremap/Makefile b/contrib/slapd-modules/adremap/Makefile
index b4c0d7b9e26e345e5af5e0a30ec6f2beb9a61485..96ebee5636271f681e496bb9c19a56ead54415a3 100644 (file)
--- a/contrib/slapd-modules/adremap/Makefile
+++ b/contrib/slapd-modules/adremap/Makefile
@@ -13,7 +13,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/allop/Makefile b/contrib/slapd-modules/allop/Makefile
index 04de358fbc4883e52492585d1697155c30bd9655..96b517bc9ea6d5a73703cfaaaaf10adb4103586c 100644 (file)
--- a/contrib/slapd-modules/allop/Makefile
+++ b/contrib/slapd-modules/allop/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/allowed/Makefile b/contrib/slapd-modules/allowed/Makefile
index e5729a19e743ac7a637fc52c6dae556261e1ced9..4c027d8afce90119d085ae36ffb93e604c782b95 100644 (file)
--- a/contrib/slapd-modules/allowed/Makefile
+++ b/contrib/slapd-modules/allowed/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/authzid/Makefile b/contrib/slapd-modules/authzid/Makefile
index b82e778a1611b4278743d209c045191e6edbdcbf..dcbb732b6fc414c6582eb466988c03954b913f4a 100644 (file)
--- a/contrib/slapd-modules/authzid/Makefile
+++ b/contrib/slapd-modules/authzid/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/autogroup/Makefile b/contrib/slapd-modules/autogroup/Makefile
index efd9678eeff17c6d57d69d993ccc1a604038cd8a..a3d4659c9a9ccbbabe6fe06be4e24a4234bfa79c 100644 (file)
--- a/contrib/slapd-modules/autogroup/Makefile
+++ b/contrib/slapd-modules/autogroup/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/cloak/Makefile b/contrib/slapd-modules/cloak/Makefile
index d120be09ae18f86a31af0abd9cbb0c56fc521cc0..656d655772d1004ff0ba24f5ec6aeeadf510cfe6 100644 (file)
--- a/contrib/slapd-modules/cloak/Makefile
+++ b/contrib/slapd-modules/cloak/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/comp_match/Makefile b/contrib/slapd-modules/comp_match/Makefile
index 09e0052b99b844210dce81b92bc51109b26f62ea..a8e168622f494edc2bba7bc567519a28ea6332b2 100644 (file)
--- a/contrib/slapd-modules/comp_match/Makefile
+++ b/contrib/slapd-modules/comp_match/Makefile
@@ -18,7 +18,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 SNACC_DIR = ../$(LDAP_SRC)/snacc

diff --git a/contrib/slapd-modules/denyop/Makefile b/contrib/slapd-modules/denyop/Makefile
index c8377623cdc95a32023fe4bd137fb3b1eaf1bb9c..b52fe0e3ee5f45a4ee16cd5177783a8fc935840f 100644 (file)
--- a/contrib/slapd-modules/denyop/Makefile
+++ b/contrib/slapd-modules/denyop/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/dsaschema/Makefile b/contrib/slapd-modules/dsaschema/Makefile
index 5ca4b4fda42c4918323598f7cf941f33160c2464..f2a106d0cf84588dfb33ab48302b94775d5752c5 100644 (file)
--- a/contrib/slapd-modules/dsaschema/Makefile
+++ b/contrib/slapd-modules/dsaschema/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/dupent/Makefile b/contrib/slapd-modules/dupent/Makefile
index 13e0b0eb4aca8b3133897057da3430055f76894a..a03a83fe4c0f6f726622cfe05f2f8826c32a001c 100644 (file)
--- a/contrib/slapd-modules/dupent/Makefile
+++ b/contrib/slapd-modules/dupent/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/kinit/Makefile b/contrib/slapd-modules/kinit/Makefile
index 2a925edd0862ae73649ad8a790730f6784f457ac..1d9cd18637560f19e72b1f60813e32e391dd71f7 100644 (file)
--- a/contrib/slapd-modules/kinit/Makefile
+++ b/contrib/slapd-modules/kinit/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/lastbind/Makefile b/contrib/slapd-modules/lastbind/Makefile
index bdc1b787e666ec2ba7e83c6f81855f7bcd92c401..b120e65160ea5689d614aaa044cce7f3a32e6b45 100644 (file)
--- a/contrib/slapd-modules/lastbind/Makefile
+++ b/contrib/slapd-modules/lastbind/Makefile
@@ -13,7 +13,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/lastmod/Makefile b/contrib/slapd-modules/lastmod/Makefile
index 9bda2571e0924e38610942e22c82e900c03f0264..3fd1218989bd0ad2ae70a4a17e97f2b0d4db5b7e 100644 (file)
--- a/contrib/slapd-modules/lastmod/Makefile
+++ b/contrib/slapd-modules/lastmod/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/noopsrch/Makefile b/contrib/slapd-modules/noopsrch/Makefile
index 3f1f421435f2855e97b64010edd68c726bc7113c..fd8dfe038ce3db7ae8d01c2e75f9d9dd331f38f9 100644 (file)
--- a/contrib/slapd-modules/noopsrch/Makefile
+++ b/contrib/slapd-modules/noopsrch/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/nops/Makefile b/contrib/slapd-modules/nops/Makefile
index 8cf86199ae53ce932cfe5ea312da917ad5f89fd6..602f3cb155710891bcbdd5e87907fa28fa062873 100644 (file)
--- a/contrib/slapd-modules/nops/Makefile
+++ b/contrib/slapd-modules/nops/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/nssov/Makefile b/contrib/slapd-modules/nssov/Makefile
index eaab6aaa493be3b77f96152489bba94fa0e33f10..2d19f3951dd7f43d56a3a1338d140288470e3514 100644 (file)
--- a/contrib/slapd-modules/nssov/Makefile
+++ b/contrib/slapd-modules/nssov/Makefile
@@ -20,7 +20,7 @@ LDAP_SRC=../../..
 LDAP_BUILD=$(LDAP_SRC)
 
 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
 
 NLDAPD_INC=-Inss-pam-ldapd

diff --git a/contrib/slapd-modules/passwd/Makefile b/contrib/slapd-modules/passwd/Makefile
index d00b32c399ab51cdf7cade4e87e845fe513e5842..e37193de8d222270fa2e6abc1306025c97bdb4e0 100644 (file)
--- a/contrib/slapd-modules/passwd/Makefile
+++ b/contrib/slapd-modules/passwd/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/passwd/argon2/Makefile b/contrib/slapd-modules/passwd/argon2/Makefile
index 0294ba04e95ffad76ad765399195e2f91f709a45..d33116a315bc9d610863c3032f581b3b596f946b 100644 (file)
--- a/contrib/slapd-modules/passwd/argon2/Makefile
+++ b/contrib/slapd-modules/passwd/argon2/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../../..
 LDAP_BUILD = ../../../..
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/passwd/pbkdf2/Makefile b/contrib/slapd-modules/passwd/pbkdf2/Makefile
index 596e4af07b59b49762a0a82b685a5007c57c60a1..6ec9bbda22c91f6f02d18bcfc365b617d16dbde8 100644 (file)
--- a/contrib/slapd-modules/passwd/pbkdf2/Makefile
+++ b/contrib/slapd-modules/passwd/pbkdf2/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../../..
 LDAP_BUILD = ../../../..
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/passwd/sha2/Makefile b/contrib/slapd-modules/passwd/sha2/Makefile
index e9fbc234ba81bc7655165e2776b91963a668781d..45b24db4882efdda7190adc43f25e7c93784b7b5 100644 (file)
--- a/contrib/slapd-modules/passwd/sha2/Makefile
+++ b/contrib/slapd-modules/passwd/sha2/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/passwd/totp/Makefile b/contrib/slapd-modules/passwd/totp/Makefile
index 2318befbf5b02afcd42b89c728cd10614f7c21c0..75dc8d13418679d81e225f3e35a1a4532f22d315 100644 (file)
--- a/contrib/slapd-modules/passwd/totp/Makefile
+++ b/contrib/slapd-modules/passwd/totp/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/proxyOld/Makefile b/contrib/slapd-modules/proxyOld/Makefile
index f8b6acaf996e10185df711a03c4400f7fb35cb66..8a46b25edc830f4c7c666a3c21f592e667f4351b 100644 (file)
--- a/contrib/slapd-modules/proxyOld/Makefile
+++ b/contrib/slapd-modules/proxyOld/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/samba4/Makefile b/contrib/slapd-modules/samba4/Makefile
index a654d3f8c48c9497db40504f04184b87e4b26d14..0a5a9f014ed37e03c8e115e31f06f2295d36938a 100644 (file)
--- a/contrib/slapd-modules/samba4/Makefile
+++ b/contrib/slapd-modules/samba4/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/smbk5pwd/Makefile b/contrib/slapd-modules/smbk5pwd/Makefile
index ae4e0718048361bb02d2135b60b819438540dac9..5a1bfb764944c34950adc147c361e6c38d6c0773 100644 (file)
--- a/contrib/slapd-modules/smbk5pwd/Makefile
+++ b/contrib/slapd-modules/smbk5pwd/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 SSL_INC = 

diff --git a/contrib/slapd-modules/trace/Makefile b/contrib/slapd-modules/trace/Makefile
index 2c36ae75b06ee7420f7a1c411174679f3e516f96..830e3898b4a6723e075f40bd50d0de3998fc888d 100644 (file)
--- a/contrib/slapd-modules/trace/Makefile
+++ b/contrib/slapd-modules/trace/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/usn/Makefile b/contrib/slapd-modules/usn/Makefile
index db095808482df91b599e05cc7a7c9e0bf52adac2..0b8795b6d59132d94858e1bff605ffa661918dba 100644 (file)
--- a/contrib/slapd-modules/usn/Makefile
+++ b/contrib/slapd-modules/usn/Makefile
@@ -3,7 +3,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/contrib/slapd-modules/vc/Makefile b/contrib/slapd-modules/vc/Makefile
index 8e3377449e4bbc92c3a4ba27b31d7c16412acd23..3f41e05da1a7ed88d87971cc78982755f6dd4e2c 100644 (file)
--- a/contrib/slapd-modules/vc/Makefile
+++ b/contrib/slapd-modules/vc/Makefile
@@ -15,7 +15,7 @@
 LDAP_SRC = ../../..
 LDAP_BUILD = $(LDAP_SRC)
 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
 
 LIBTOOL = $(LDAP_BUILD)/libtool

diff --git a/doc/man/man3/ldap_dup.3 b/doc/man/man3/ldap_dup.3
index e2717e764f35766aea5182c93296a5d44b9911d8..af7d2d3585326faf5b5d39d302e8f43acf5b0cb2 100644 (file)
--- a/doc/man/man3/ldap_dup.3
+++ b/doc/man/man3/ldap_dup.3
@@ -46,7 +46,6 @@ and
 functions are used in conjunction with a "thread safe" version
 of
 .B libldap
-.RB ( libldap_r )
 to enable operation thread safe API calls, so that a single session
 may be simultaneously used across multiple threads with consistent
 error handling.

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index 439463344fcc6ea11deb1cd6ff80fb404c478038..1a0a012c3131b4e191f705a7ba78318495902014 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -15,7 +15,7 @@
  */
 
 #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_int_thread.h"

diff --git a/libraries/Makefile.in b/libraries/Makefile.in
index a74f9138167f0709be40a99b2f973e918bd310a7..f6b5175e18101057af36615590de1a81bba78035 100644 (file)
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -17,6 +17,6 @@ SUBDIRS= \
        liblutil \
        liblber \
        liblunicode \
-       libldap libldap_r \
+       libldap \
        librewrite
 

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 0014a5a1641c671443bbe9acdb61833391d82741..716869c58b762e9f6bb65f87e3ac894bb0aa1bb1 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -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 \
        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
+       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 \
        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 \
        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
+       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_LIBDIR= ../../libraries
 
-LIB_DEFS = -DLDAP_LIBRARY
+LIB_DEFS = -DLDAP_LIBRARY -DLDAP_R_COMPILE
 
 XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)

diff --git a/libraries/libldap_r/ldap_thr_debug.h b/libraries/libldap/ldap_thr_debug.h
similarity index 98%
rename from libraries/libldap_r/ldap_thr_debug.h
rename to libraries/libldap/ldap_thr_debug.h
index f74e6be24e1683e29a52624e9899dbedf1da73c2..9b72f71ce08a5ebf36a55ddc6925c8145eeaf125 100644 (file)
--- a/libraries/libldap_r/ldap_thr_debug.h
+++ b/libraries/libldap/ldap_thr_debug.h
@@ -17,7 +17,7 @@
 #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.
  */
 
@@ -50,7 +50,7 @@
  * include/ldap_<int,pvt>_thread.h also do some thr_debug magic.
  *
  * 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_*().
  * thr_debug.c defines the ldap_pvt_*() and ldap_debug_*() functions.
  * In thread.c, ldap_pvt_thread_<initialize/destroy>() will call

diff --git a/libraries/libldap_r/rdwr.c b/libraries/libldap/rdwr.c
similarity index 100%
rename from libraries/libldap_r/rdwr.c
rename to libraries/libldap/rdwr.c

diff --git a/libraries/libldap_r/rq.c b/libraries/libldap/rq.c
similarity index 100%
rename from libraries/libldap_r/rq.c
rename to libraries/libldap/rq.c

diff --git a/libraries/libldap_r/thr_debug.c b/libraries/libldap/thr_debug.c
similarity index 99%
rename from libraries/libldap_r/thr_debug.c
rename to libraries/libldap/thr_debug.c
index 169b336dd875a68aff584dd2d26facaedd7b7d2b..cce1001753bfc22e437de4cd50358a6b1d43f5ba 100644 (file)
--- a/libraries/libldap_r/thr_debug.c
+++ b/libraries/libldap/thr_debug.c
@@ -673,7 +673,7 @@ ldap_debug_thread_initialize( void )
                        for( i = rc2 = 0; i < Idx_max; i++ )
                                rc2 |= ldap_int_thread_mutex_init( &resource_mutexes[i] );
                        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 );
                }
        }

diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap/thr_nt.c
similarity index 100%
rename from libraries/libldap_r/thr_nt.c
rename to libraries/libldap/thr_nt.c

diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap/thr_posix.c
similarity index 100%
rename from libraries/libldap_r/thr_posix.c
rename to libraries/libldap/thr_posix.c

diff --git a/libraries/libldap_r/thr_pth.c b/libraries/libldap/thr_pth.c
similarity index 100%
rename from libraries/libldap_r/thr_pth.c
rename to libraries/libldap/thr_pth.c

diff --git a/libraries/libldap_r/thr_stub.c b/libraries/libldap/thr_stub.c
similarity index 100%
rename from libraries/libldap_r/thr_stub.c
rename to libraries/libldap/thr_stub.c

diff --git a/libraries/libldap_r/thr_thr.c b/libraries/libldap/thr_thr.c
similarity index 100%
rename from libraries/libldap_r/thr_thr.c
rename to libraries/libldap/thr_thr.c

diff --git a/libraries/libldap_r/threads.c b/libraries/libldap/threads.c
similarity index 100%
rename from libraries/libldap_r/threads.c
rename to libraries/libldap/threads.c

diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap/tpool.c
similarity index 100%
rename from libraries/libldap_r/tpool.c
rename to libraries/libldap/tpool.c

diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in
deleted file mode 100644 (file)
index b100f00..0000000
--- a/libraries/libldap_r/Makefile.in
+++ /dev/null
@@ -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)
-

diff --git a/libraries/librewrite/Makefile.in b/libraries/librewrite/Makefile.in
index 9148eb5f5c8e817c1401bb490f48b3be2686b0e1..c4a30c6145f70b5a4451cfb7837435569860df88 100644 (file)
--- a/libraries/librewrite/Makefile.in
+++ b/libraries/librewrite/Makefile.in
@@ -29,7 +29,7 @@ LDAP_LIBDIR= ../../libraries
 LIBRARY = librewrite.a
 PROGRAMS       = rewrite
 XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \
-       $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+       $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA)
 XXLIBS  = $(SECURITY_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS)
 

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index fb7194a7b5f369ef6dc8e90a9669dc3c9e2d801a..a56a91241300f7cab5fe5ac7e39ecbfa8de59b98 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -104,7 +104,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 # symbols that are imported from other DLLs). The set of symbols to
 # export INCLUDES symbols from all static libraries that slapd gets
 # 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
 # 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

diff --git a/servers/slapd/back-asyncmeta/Makefile.in b/servers/slapd/back-asyncmeta/Makefile.in
index aa06624cfb3b9c53e749fa96de8964547724fea8..8e5ba1ed14cdc393e80e6000f622c262c5377713 100644 (file)
--- a/servers/slapd/back-asyncmeta/Makefile.in
+++ b/servers/slapd/back-asyncmeta/Makefile.in
@@ -35,7 +35,7 @@ BUILD_MOD = @BUILD_ASYNCMETA@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-dnssrv/Makefile.in b/servers/slapd/back-dnssrv/Makefile.in
index b864dba3a8f8336ae6f832480f5c6c4769c48843..9522e149776df9df4dc3949be730d7faf89127b2 100644 (file)
--- a/servers/slapd/back-dnssrv/Makefile.in
+++ b/servers/slapd/back-dnssrv/Makefile.in
@@ -30,7 +30,7 @@ BUILD_MOD = @BUILD_DNSSRV@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in
index 0a1a5f1b918b1b11b97fdc5a116b895ea3a0fe1c..7adda1c1b4eac5b1043dcd2b01536c5484a85deb 100644 (file)
--- a/servers/slapd/back-ldap/Makefile.in
+++ b/servers/slapd/back-ldap/Makefile.in
@@ -29,7 +29,7 @@ BUILD_MOD = @BUILD_LDAP@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-ldif/Makefile.in b/servers/slapd/back-ldif/Makefile.in
index c5188b0bb4c14461536fc711ef3cd51d2e19adfa..b289dd7b99f7c8c6848441b17bb7b190befc619e 100644 (file)
--- a/servers/slapd/back-ldif/Makefile.in
+++ b/servers/slapd/back-ldif/Makefile.in
@@ -25,7 +25,7 @@ BUILD_MOD = yes
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in
index c2094e99d02a7f4bf141fac414156ef7acfb8799..b349864d9bc8ca6d882bc83e1efbf6a982961ffe 100644 (file)
--- a/servers/slapd/back-mdb/Makefile.in
+++ b/servers/slapd/back-mdb/Makefile.in
@@ -38,7 +38,7 @@ mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_MDB@_DEFS)
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-meta/Makefile.in b/servers/slapd/back-meta/Makefile.in
index 9a1fea78b0defa48d6577baa6937cf1010d33d2f..7c0ec6bbdfd10139146ce717c5aa050a7dcb6101 100644 (file)
--- a/servers/slapd/back-meta/Makefile.in
+++ b/servers/slapd/back-meta/Makefile.in
@@ -29,7 +29,7 @@ BUILD_MOD = @BUILD_META@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in
index 2314078cd4b53b4b509a9a23323e7efb25985c6d..f795453e53b9abd32da7481faa7c949c4e5e7dc2 100644 (file)
--- a/servers/slapd/back-monitor/Makefile.in
+++ b/servers/slapd/back-monitor/Makefile.in
@@ -33,7 +33,7 @@ BUILD_MOD = @BUILD_MONITOR@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-ndb/Makefile.in b/servers/slapd/back-ndb/Makefile.in
index 95032c76247fc27968c39de62d119041c7466712..6998c46a7e67688d497f29b7b96e1f10c669fe87 100644 (file)
--- a/servers/slapd/back-ndb/Makefile.in
+++ b/servers/slapd/back-ndb/Makefile.in
@@ -33,7 +33,7 @@ mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_NDB@_DEFS)
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-null/Makefile.in b/servers/slapd/back-null/Makefile.in
index 0aa6234398ba77da813783a6aa873d520f793954..f07573065afd4d449d77ead95a5f527417350de2 100644 (file)
--- a/servers/slapd/back-null/Makefile.in
+++ b/servers/slapd/back-null/Makefile.in
@@ -25,7 +25,7 @@ BUILD_MOD = @BUILD_NULL@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in
index b11ae6086c8bf3222074073e6e349625e9c88009..d2d0175cdc3294caa18d6e3237489488906c9c4d 100644 (file)
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -25,7 +25,7 @@ BUILD_MOD = @BUILD_PASSWD@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-perl/Makefile.in b/servers/slapd/back-perl/Makefile.in
index be0b0fa838c76a1e60f5c467107231a4cb2e92f1..e94327d9227e229ca675b47369b9d5b1fe964f63 100644 (file)
--- a/servers/slapd/back-perl/Makefile.in
+++ b/servers/slapd/back-perl/Makefile.in
@@ -30,7 +30,7 @@ mod_DEFS = -DSLAPD_IMPORT
 MOD_DEFS = $(@BUILD_PERL@_DEFS)
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-relay/Makefile.in b/servers/slapd/back-relay/Makefile.in
index 4cf18de0d923a30df886af8516d9d0649912558a..5c7d6c2984ec33205faf9a66aa081a808080729e 100644 (file)
--- a/servers/slapd/back-relay/Makefile.in
+++ b/servers/slapd/back-relay/Makefile.in
@@ -25,7 +25,7 @@ BUILD_MOD = @BUILD_RELAY@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(REWRITE)
 

diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index 29fbd6bf8011b2c6e7862d447214b9816d5b8c73..dbc19372e2ffa26dc961e5fa1f4c90cba4af4e98 100644 (file)
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -27,7 +27,7 @@ BUILD_MOD = @BUILD_SHELL@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-sock/Makefile.in b/servers/slapd/back-sock/Makefile.in
index 4d0268da34c571f9ada1431036384baf9db9ea8d..643a66d25c8c30959e3954bdcaa957cb0ce85f65 100644 (file)
--- a/servers/slapd/back-sock/Makefile.in
+++ b/servers/slapd/back-sock/Makefile.in
@@ -31,7 +31,7 @@ BUILD_MOD = @BUILD_SOCK@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/back-sql/Makefile.in b/servers/slapd/back-sql/Makefile.in
index 27d2f582feeb9c4c1201402c0e800bef377fd70a..67c57f2dcde92693d28a12e447051f3e7f958cc7 100644 (file)
--- a/servers/slapd/back-sql/Makefile.in
+++ b/servers/slapd/back-sql/Makefile.in
@@ -29,7 +29,7 @@ BUILD_MOD = @BUILD_SQL@
 mod_DEFS = -DSLAPD_IMPORT
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(SLAPD_SQL_LIBS)
 

diff --git a/servers/slapd/back-wt/Makefile.in b/servers/slapd/back-wt/Makefile.in
index 4723be0d7c1e2d3307ddd50f84c501b9748ab58f..ddafd38b6dd7acc80f83bd58de83a9543cb8c48a 100644 (file)
--- a/servers/slapd/back-wt/Makefile.in
+++ b/servers/slapd/back-wt/Makefile.in
@@ -38,7 +38,7 @@ MOD_DEFS = @WT_INCS@
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index 1f8f178d3c4bd8fae8d8e7f80d007ee4d3b2dcf7..f64c3cabfbc781532cf081b879c1db356778efeb 100644 (file)
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -49,7 +49,7 @@ LDAP_LIBDIR= ../../../libraries
 
 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)
 UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 

diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 890419014d1312bc38cc7cf37e94b8df4f052498..4529469db44023413f4ec65d94115cbaf2489eaa 100644 (file)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -25,9 +25,8 @@ LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
 
 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)
-RLIBS = $(XRLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
+RLIBS = $(XLIBS) $(XXLIBS) $(AC_LIBS) $(XXXLIBS)
 
 
 OBJS     = slapd-common.o
@@ -61,6 +60,6 @@ slapd-bind: slapd-bind.o $(OBJS) $(XLIBS)
 ldif-filter: ldif-filter.o $(XLIBS)
        $(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)