From c06ac436e23520bb765ad67bd702fe629df39ed9 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 13 May 2020 16:54:50 +0000 Subject: [PATCH] ITS#9235 Merge libldap_r into libldap --- .gitignore | 70 --------------- build/top.mk | 3 +- configure.in | 1 - contrib/slapd-modules/acl/Makefile | 2 +- contrib/slapd-modules/addpartial/Makefile | 2 +- contrib/slapd-modules/adremap/Makefile | 2 +- contrib/slapd-modules/allop/Makefile | 2 +- contrib/slapd-modules/allowed/Makefile | 2 +- contrib/slapd-modules/authzid/Makefile | 2 +- contrib/slapd-modules/autogroup/Makefile | 2 +- contrib/slapd-modules/cloak/Makefile | 2 +- contrib/slapd-modules/comp_match/Makefile | 2 +- contrib/slapd-modules/denyop/Makefile | 2 +- contrib/slapd-modules/dsaschema/Makefile | 2 +- contrib/slapd-modules/dupent/Makefile | 2 +- contrib/slapd-modules/kinit/Makefile | 2 +- contrib/slapd-modules/lastbind/Makefile | 2 +- contrib/slapd-modules/lastmod/Makefile | 2 +- contrib/slapd-modules/noopsrch/Makefile | 2 +- contrib/slapd-modules/nops/Makefile | 2 +- contrib/slapd-modules/nssov/Makefile | 2 +- contrib/slapd-modules/passwd/Makefile | 2 +- contrib/slapd-modules/passwd/argon2/Makefile | 2 +- contrib/slapd-modules/passwd/pbkdf2/Makefile | 2 +- contrib/slapd-modules/passwd/sha2/Makefile | 2 +- contrib/slapd-modules/passwd/totp/Makefile | 2 +- contrib/slapd-modules/proxyOld/Makefile | 2 +- contrib/slapd-modules/samba4/Makefile | 2 +- contrib/slapd-modules/smbk5pwd/Makefile | 2 +- contrib/slapd-modules/trace/Makefile | 2 +- contrib/slapd-modules/usn/Makefile | 2 +- contrib/slapd-modules/vc/Makefile | 2 +- doc/man/man3/ldap_dup.3 | 1 - include/ldap_pvt_thread.h | 2 +- libraries/Makefile.in | 2 +- libraries/libldap/Makefile.in | 8 +- .../{libldap_r => libldap}/ldap_thr_debug.h | 4 +- libraries/{libldap_r => libldap}/rdwr.c | 0 libraries/{libldap_r => libldap}/rq.c | 0 libraries/{libldap_r => libldap}/thr_debug.c | 2 +- libraries/{libldap_r => libldap}/thr_nt.c | 0 libraries/{libldap_r => libldap}/thr_posix.c | 0 libraries/{libldap_r => libldap}/thr_pth.c | 0 libraries/{libldap_r => libldap}/thr_stub.c | 0 libraries/{libldap_r => libldap}/thr_thr.c | 0 libraries/{libldap_r => libldap}/threads.c | 0 libraries/{libldap_r => libldap}/tpool.c | 0 libraries/libldap_r/Makefile.in | 90 ------------------- libraries/librewrite/Makefile.in | 2 +- servers/slapd/Makefile.in | 2 +- servers/slapd/back-asyncmeta/Makefile.in | 2 +- servers/slapd/back-dnssrv/Makefile.in | 2 +- servers/slapd/back-ldap/Makefile.in | 2 +- servers/slapd/back-ldif/Makefile.in | 2 +- servers/slapd/back-mdb/Makefile.in | 2 +- servers/slapd/back-meta/Makefile.in | 2 +- servers/slapd/back-monitor/Makefile.in | 2 +- servers/slapd/back-ndb/Makefile.in | 2 +- servers/slapd/back-null/Makefile.in | 2 +- servers/slapd/back-passwd/Makefile.in | 2 +- servers/slapd/back-perl/Makefile.in | 2 +- servers/slapd/back-relay/Makefile.in | 2 +- servers/slapd/back-shell/Makefile.in | 2 +- servers/slapd/back-sock/Makefile.in | 2 +- servers/slapd/back-sql/Makefile.in | 2 +- servers/slapd/back-wt/Makefile.in | 2 +- servers/slapd/overlays/Makefile.in | 2 +- tests/progs/Makefile.in | 5 +- 68 files changed, 61 insertions(+), 223 deletions(-) rename libraries/{libldap_r => libldap}/ldap_thr_debug.h (98%) rename libraries/{libldap_r => libldap}/rdwr.c (100%) rename libraries/{libldap_r => libldap}/rq.c (100%) rename libraries/{libldap_r => libldap}/thr_debug.c (99%) rename libraries/{libldap_r => libldap}/thr_nt.c (100%) rename libraries/{libldap_r => libldap}/thr_posix.c (100%) rename libraries/{libldap_r => libldap}/thr_pth.c (100%) rename libraries/{libldap_r => libldap}/thr_stub.c (100%) rename libraries/{libldap_r => libldap}/thr_thr.c (100%) rename libraries/{libldap_r => libldap}/threads.c (100%) rename libraries/{libldap_r => libldap}/tpool.c (100%) delete mode 100644 libraries/libldap_r/Makefile.in diff --git a/.gitignore b/.gitignore index 5baf6ba863..0f8012c05a 100644 --- 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 7aed7a85f8..264b4bab2e 100644 --- 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 118fffae85..fbbeaa67ee 100644 --- 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 40a8e9ecca..a67ca242bc 100644 --- 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 a999d7ffe2..1994f0de7a 100644 --- 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 b4c0d7b9e2..96ebee5636 100644 --- 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 04de358fbc..96b517bc9e 100644 --- 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 e5729a19e7..4c027d8afc 100644 --- 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 b82e778a16..dcbb732b6f 100644 --- 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 efd9678eef..a3d4659c9a 100644 --- 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 d120be09ae..656d655772 100644 --- 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 09e0052b99..a8e168622f 100644 --- 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 c8377623cd..b52fe0e3ee 100644 --- 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 5ca4b4fda4..f2a106d0cf 100644 --- 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 13e0b0eb4a..a03a83fe4c 100644 --- 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 2a925edd08..1d9cd18637 100644 --- 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 bdc1b787e6..b120e65160 100644 --- 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 9bda2571e0..3fd1218989 100644 --- 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 3f1f421435..fd8dfe038c 100644 --- 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 8cf86199ae..602f3cb155 100644 --- 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 eaab6aaa49..2d19f3951d 100644 --- 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 d00b32c399..e37193de8d 100644 --- 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 0294ba04e9..d33116a315 100644 --- 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 596e4af07b..6ec9bbda22 100644 --- 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 e9fbc234ba..45b24db488 100644 --- 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 2318befbf5..75dc8d1341 100644 --- 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 f8b6acaf99..8a46b25edc 100644 --- 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 a654d3f8c4..0a5a9f014e 100644 --- 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 ae4e071804..5a1bfb7649 100644 --- 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 2c36ae75b0..830e3898b4 100644 --- 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 db09580848..0b8795b6d5 100644 --- 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 8e3377449e..3f41e05da1 100644 --- 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 e2717e764f..af7d2d3585 100644 --- 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 439463344f..1a0a012c31 100644 --- 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 a74f913816..f6b5175e18 100644 --- 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 0014a5a164..716869c58b 100644 --- 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 f74e6be24e..9b72f71ce0 100644 --- 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__thread.h also do some thr_debug magic. * * So, - * libldap_r/ thus define ldap_int_thread_*() instead + * libldap/ 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_() 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 169b336dd8..cce1001753 100644 --- 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 index b100f00fa3..0000000000 --- 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 . -## -## 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 -## . - -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 9148eb5f5c..c4a30c6145 100644 --- 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 fb7194a7b5..a56a912413 100644 --- 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 aa06624cfb..8e5ba1ed14 100644 --- 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 b864dba3a8..9522e14977 100644 --- 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 0a1a5f1b91..7adda1c1b4 100644 --- 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 c5188b0bb4..b289dd7b99 100644 --- 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 c2094e99d0..b349864d9b 100644 --- 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 9a1fea78b0..7c0ec6bbdf 100644 --- 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 2314078cd4..f795453e53 100644 --- 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 95032c7624..6998c46a7e 100644 --- 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 0aa6234398..f07573065a 100644 --- 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 b11ae6086c..d2d0175cdc 100644 --- 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 be0b0fa838..e94327d922 100644 --- 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 4cf18de0d9..5c7d6c2984 100644 --- 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 29fbd6bf80..dbc19372e2 100644 --- 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 4d0268da34..643a66d25c 100644 --- 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 27d2f582fe..67c57f2dcd 100644 --- 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 4723be0d7c..ddafd38b6d 100644 --- 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 1f8f178d3c..f64c3cabfb 100644 --- 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 890419014d..4529469db4 100644 --- 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)