From 08a6aadc924103b045c4dd4b4ef6b56952252257 Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: May 27 2019 12:50:59 +0000
Subject: Ticket 49730 - Remove unused Mozilla ldapsdk variables


Bug Description:
The recent removal of support for Mozilla's ldapsdk in b770ac7
left behind some unused variables.

Fix Description:
Remove the unused variables from the code base.

Author: Hugh McMaster <hugh.mcmaster@outlook.com>

Review by: firstyear, mreynolds, mhonek

---

diff --git a/Makefile.am b/Makefile.am
index 01ac3a0..2c1dc38 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -137,7 +137,7 @@ AM_CFLAGS = $(DEBUG_CFLAGS) $(GCCSEC_CFLAGS) $(ASAN_CFLAGS) $(MSAN_CFLAGS) $(TSA
 AM_CXXFLAGS = $(DEBUG_CXXFLAGS) $(GCCSEC_CFLAGS) $(ASAN_CFLAGS) $(MSAN_CFLAGS) $(TSAN_CFLAGS) $(UBSAN_CFLAGS)
 # Flags for Directory Server
 # WARNING: This needs a clean up, because slap.h is a horrible mess and is publically exposed!
-DSPLUGIN_CPPFLAGS = $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) $(SYSTEMD_DEFINES) $(NUNCSTANS_INCLUDES) @openldap_inc@ @ldapsdk_inc@ $(NSS_CFLAGS) $(NSPR_INCLUDES) $(SYSTEMD_CFLAGS)
+DSPLUGIN_CPPFLAGS = $(DS_DEFINES) $(DS_INCLUDES) $(PATH_DEFINES) $(SYSTEMD_DEFINES) $(NUNCSTANS_INCLUDES) @openldap_inc@ $(NSS_CFLAGS) $(NSPR_INCLUDES) $(SYSTEMD_CFLAGS)
 # This should give access to internal headers only for tests!!!
 DSINTERNAL_CPPFLAGS = -I$(srcdir)/include/ldaputil
 # Flags for Datastructure Library
@@ -2211,8 +2211,6 @@ fixupcmd = sed \
 	-e 's,@libdir\@,$(libdir),g' \
 	-e 's,@libexecdir\@,$(libexecdir),g' \
 	-e 's,@nss_libdir\@,$(nss_libdir),g' \
-	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
-	-e 's,@ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
 	-e 's,@ldaptool_bindir\@,$(ldaptool_bindir),g' \
 	-e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
 	-e 's,@plainldif_opts\@,$(plainldif_opts),g' \
diff --git a/configure.ac b/configure.ac
index 3660e68..aa50ce1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -885,10 +885,6 @@ AC_SUBST(PACKAGE_BASE_VERSION)
 AM_CONDITIONAL(OPENLDAP,test "$with_openldap" = "yes")
 
 # write out paths for binary components
-AC_SUBST(ldapsdk_inc)
-AC_SUBST(ldapsdk_lib)
-AC_SUBST(ldapsdk_libdir)
-AC_SUBST(ldapsdk_bindir)
 AC_SUBST(ldaplib)
 AC_SUBST(ldaplib_defs)
 AC_SUBST(ldaptool_bindir)
diff --git a/ldap/admin/src/scripts/ldif2ldap.in b/ldap/admin/src/scripts/ldif2ldap.in
index 99497d5..a2b0f1c 100755
--- a/ldap/admin/src/scripts/ldif2ldap.in
+++ b/ldap/admin/src/scripts/ldif2ldap.in
@@ -2,7 +2,6 @@
 
 . @datadir@/@package_name@/data/DSSharedLib
 
-libpath_add "@ldapsdk_libdir@"
 libpath_add "@libdir@"
 libpath_add "@nss_libdir@"
 libpath_add "@libdir@/@package_name@/"
diff --git a/ldap/admin/src/scripts/monitor.in b/ldap/admin/src/scripts/monitor.in
index d833d87..291a51e 100755
--- a/ldap/admin/src/scripts/monitor.in
+++ b/ldap/admin/src/scripts/monitor.in
@@ -3,7 +3,6 @@
 . @datadir@/@package_name@/data/DSSharedLib
 
 libpath_add "@libdir@/@package_name@/"
-libpath_add "@ldapsdk_libdir@"
 libpath_add "@libdir@"
 libpath_add "@nss_libdir@"