summaryrefslogtreecommitdiffstats
path: root/m4
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 /m4
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 'm4')
-rw-r--r--m4/mozldap.m44
-rw-r--r--m4/openldap.m45
2 files changed, 9 insertions, 0 deletions
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
index 51e151db..c1744b49 100644
--- a/m4/mozldap.m4
+++ b/m4/mozldap.m4
@@ -167,4 +167,8 @@ dnl default path for the ldap c sdk tools (see [210947] for more details)
fi
AC_DEFINE([USE_MOZLDAP], [1], [If defined, using MozLDAP for LDAP SDK])
AC_DEFINE([HAVE_LDAP_URL_PARSE_NO_DEFAULTS], [1], [have the function ldap_url_parse_no_defaults])
+ # where to find ldapsearch, et. al.
+ ldaptool_bindir=$ldapsdk_bindir
+ # default options to pass to the tools
+ ldaptool_opts=
fi
diff --git a/m4/openldap.m4 b/m4/openldap.m4
index cf91a89e..c9a3a1e5 100644
--- a/m4/openldap.m4
+++ b/m4/openldap.m4
@@ -146,4 +146,9 @@ if test "$with_openldap" = yes ; then
CPPFLAGS="$save_cppflags"
AC_DEFINE([USE_OPENLDAP], [1], [If defined, using OpenLDAP for LDAP SDK])
+ # where to find ldapsearch, et. al.
+ ldaptool_bindir=$openldap_bindir
+ # default options to pass to the tools
+ # use -x because all of our scripts use simple bind
+ ldaptool_opts=-x
fi