summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2010-06-07 12:50:17 -0600
committerRich Megginson <rmeggins@redhat.com>2010-08-31 13:35:53 -0600
commit36101b6491afc0a843ba50b7e506e622271e9177 (patch)
tree411f97320e11afbeb80e4996b1752bc90fff7e8a /Makefile.am
parenta6a630da7c86f5d340506c364a1d445542895f9c (diff)
downloadds-36101b6491afc0a843ba50b7e506e622271e9177.tar.gz
ds-36101b6491afc0a843ba50b7e506e622271e9177.tar.xz
ds-36101b6491afc0a843ba50b7e506e622271e9177.zip
Add -x option to ldap tools when using openldap
We have many scripts that use ldapsearch, ldapmodify, etc. All of these currently use simple auth. When using the openldap versions of these scripts, we have to pass the -x argument to use simple auth. A new configure parameter ldaptool_opts is used to pass this down into the scripts. Reviewed by: nkinder (Thanks!) Platforms tested: Fedora 14 (rawhide)
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index f6c149a6..9cbb12b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1305,6 +1305,8 @@ fixupcmd = sed \
-e 's,@nss_libdir\@,$(libdir),g' \
-e 's,@ldapsdk_libdir\@,$(libdir),g' \
-e 's,@ldapsdk_bindir\@,$(bindir),g' \
+ -e 's,@ldaptool_bindir\@,$(bindir),g' \
+ -e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
-e 's,@db_libdir\@,$(libdir),g' \
-e 's,@db_bindir\@,$(bindir),g' \
-e 's,@sasl_libdir\@,$(libdir),g' \
@@ -1360,6 +1362,8 @@ fixupcmd = sed \
-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,@db_libdir\@,$(db_libdir),g' \
-e 's,@db_bindir\@,$(db_bindir),g' \
-e 's,@sasl_libdir\@,$(sasl_libdir),g' \