openldap ldapsearch uses -LLL to suppress # version: N

mozldap uses -1 but openldap uses -LLL to suppress printing the
in ldapsearch output - add a flag for this

10 files changed, 21 insertions, 7 deletions

diff --git a/Makefile.am b/Makefile.am
index 9cbb12b6..dc22ce10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1307,6 +1307,7 @@ fixupcmd = sed \
 	-e 's,@ldapsdk_bindir\@,$(bindir),g' \
 	-e 's,@ldaptool_bindir\@,$(bindir),g' \
 	-e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
+	-e 's,@plainldif_opts\@,$(plainldif_opts),g' \
 	-e 's,@db_libdir\@,$(libdir),g' \
 	-e 's,@db_bindir\@,$(bindir),g' \
 	-e 's,@sasl_libdir\@,$(libdir),g' \
@@ -1363,7 +1364,7 @@ fixupcmd = sed \
 	-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' \
 	-e 's,@db_libdir\@,$(db_libdir),g' \
 	-e 's,@db_bindir\@,$(db_bindir),g' \
 	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
diff --git a/Makefile.in b/Makefile.in
index 70bca126..f6d38e92 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1128,6 +1128,7 @@ pcre_lib = @pcre_lib@
 pcre_libdir = @pcre_libdir@
 perldir = $(libdir)@perldir@
 perlexec = @perlexec@
+plainldif_opts = @plainldif_opts@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 propertydir = $(datadir)@propertydir@
@@ -2295,7 +2296,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
 @BUNDLE_FALSE@	-e 's,@ldapsdk_libdir\@,$(ldapsdk_libdir),g' \
 @BUNDLE_FALSE@	-e 's,@ldapsdk_bindir\@,$(ldapsdk_bindir),g' \
 @BUNDLE_FALSE@	-e 's,@ldaptool_bindir\@,$(ldaptool_bindir),g' \
-@BUNDLE_FALSE@	-e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
+@BUNDLE_FALSE@	-e 's,@plainldif_opts\@,$(plainldif_opts),g' \
 @BUNDLE_FALSE@	-e 's,@db_libdir\@,$(db_libdir),g' \
 @BUNDLE_FALSE@	-e 's,@db_bindir\@,$(db_bindir),g' \
 @BUNDLE_FALSE@	-e 's,@sasl_libdir\@,$(sasl_libdir),g' \
@@ -2363,6 +2364,7 @@ rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBS
 @BUNDLE_TRUE@	-e 's,@ldapsdk_bindir\@,$(bindir),g' \
 @BUNDLE_TRUE@	-e 's,@ldaptool_bindir\@,$(bindir),g' \
 @BUNDLE_TRUE@	-e 's,@ldaptool_opts\@,$(ldaptool_opts),g' \
+@BUNDLE_TRUE@	-e 's,@plainldif_opts\@,$(plainldif_opts),g' \
 @BUNDLE_TRUE@	-e 's,@db_libdir\@,$(libdir),g' \
 @BUNDLE_TRUE@	-e 's,@db_bindir\@,$(bindir),g' \
 @BUNDLE_TRUE@	-e 's,@sasl_libdir\@,$(libdir),g' \
diff --git a/configure b/configure
index 7ac8b756..0782bca7 100755
--- a/configure
+++ b/configure
@@ -465,7 +465,7 @@ ac_includes_default="\
 #endif"
 
 ac_default_prefix=/opt/$PACKAGE_NAME
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CONSOLE_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_auto_dn_suffix_TRUE enable_auto_dn_suffix_FALSE enable_bitwise_TRUE enable_bitwise_FALSE enable_presence_TRUE enable_presence_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir updatedir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE THREADLIB LIBCRYPT LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG KRB5_CONFIG_BIN kerberos_inc kerberos_lib kerberos_libdir with_selinux PACKAGE_BASE_VERSION SELINUX_TRUE SELINUX_FALSE OPENLDAP_TRUE OPENLDAP_FALSE nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir openldap_inc openldap_lib openldap_libdir openldap_bindir ldaptool_bindir ldaptool_opts ol_libver db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link pcre_inc pcre_lib pcre_libdir brand capbrand vendor LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CONSOLE_VERSION MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS debug_defs BUNDLE_TRUE BUNDLE_FALSE enable_pam_passthru_TRUE enable_pam_passthru_FALSE enable_dna_TRUE enable_dna_FALSE enable_ldapi_TRUE enable_ldapi_FALSE enable_autobind_TRUE enable_autobind_FALSE enable_auto_dn_suffix_TRUE enable_auto_dn_suffix_FALSE enable_bitwise_TRUE enable_bitwise_FALSE enable_presence_TRUE enable_presence_FALSE with_fhs_opt configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir perldir infdir mibdir updatedir defaultuser defaultgroup instconfigdir WINNT_TRUE WINNT_FALSE THREADLIB LIBCRYPT LIBSOCKET LIBNSL LIBDL LIBCSTD LIBCRUN initdir perlexec initconfigdir HPUX_TRUE HPUX_FALSE SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG KRB5_CONFIG_BIN kerberos_inc kerberos_lib kerberos_libdir with_selinux PACKAGE_BASE_VERSION SELINUX_TRUE SELINUX_FALSE OPENLDAP_TRUE OPENLDAP_FALSE nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir openldap_inc openldap_lib openldap_libdir openldap_bindir ldaptool_bindir ldaptool_opts plainldif_opts ol_libver db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir sasl_path svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link pcre_inc pcre_lib pcre_libdir brand capbrand vendor LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -24913,6 +24913,8 @@ _ACEOF
   # default options to pass to the tools
   # use -x because all of our scripts use simple bind
   ldaptool_opts=-x
+  # get plain output from ldapsearch - no version, no comments
+  plainldif_opts=-LLL
 fi
 
 # BEGIN COPYRIGHT BLOCK
@@ -25239,6 +25241,8 @@ _ACEOF
   ldaptool_bindir=$ldapsdk_bindir
   # default options to pass to the tools
   ldaptool_opts=
+  # get plain output from ldapsearch - no version
+  plainldif_opts=-1
 fi
 
 # BEGIN COPYRIGHT BLOCK
@@ -27446,6 +27450,7 @@ fi
 
 
 
+
 cat >>confdefs.h <<\_ACEOF
 #define LDAP_DEBUG 1
 _ACEOF
@@ -28373,6 +28378,7 @@ s,@openldap_libdir@,$openldap_libdir,;t t
 s,@openldap_bindir@,$openldap_bindir,;t t
 s,@ldaptool_bindir@,$ldaptool_bindir,;t t
 s,@ldaptool_opts@,$ldaptool_opts,;t t
+s,@plainldif_opts@,$plainldif_opts,;t t
 s,@ol_libver@,$ol_libver,;t t
 s,@db_inc@,$db_inc,;t t
 s,@db_incdir@,$db_incdir,;t t
diff --git a/configure.ac b/configure.ac
index 914c8628..54dadf1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,6 +508,7 @@ AC_SUBST(openldap_libdir)
 AC_SUBST(openldap_bindir)
 AC_SUBST(ldaptool_bindir)
 AC_SUBST(ldaptool_opts)
+AC_SUBST(plainldif_opts)
 AC_SUBST(ol_libver)
 AC_SUBST(db_inc)
 AC_SUBST(db_incdir)
diff --git a/ldap/admin/src/scripts/template-ns-accountstatus.pl.in b/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
index a0d7f28e..ba6a491a 100644
--- a/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
+++ b/ldap/admin/src/scripts/template-ns-accountstatus.pl.in
@@ -396,7 +396,7 @@ $ENV{'PATH'} = "$prefix@ldaptool_bindir@:$prefix/usr/bin:@ldaptool_bindir@:/usr/
 $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
-$ldapsearch="ldapsearch @ldaptool_opts@ -1";
+$ldapsearch="ldapsearch @ldaptool_opts@ @plainldif_opts@";
 $ldapmodify="ldapmodify @ldaptool_opts@";
  
 # Default values
diff --git a/ldap/admin/src/scripts/template-ns-activate.pl.in b/ldap/admin/src/scripts/template-ns-activate.pl.in
index a0d7f28e..ba6a491a 100644
--- a/ldap/admin/src/scripts/template-ns-activate.pl.in
+++ b/ldap/admin/src/scripts/template-ns-activate.pl.in
@@ -396,7 +396,7 @@ $ENV{'PATH'} = "$prefix@ldaptool_bindir@:$prefix/usr/bin:@ldaptool_bindir@:/usr/
 $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
-$ldapsearch="ldapsearch @ldaptool_opts@ -1";
+$ldapsearch="ldapsearch @ldaptool_opts@ @plainldif_opts@";
 $ldapmodify="ldapmodify @ldaptool_opts@";
  
 # Default values
diff --git a/ldap/admin/src/scripts/template-ns-inactivate.pl.in b/ldap/admin/src/scripts/template-ns-inactivate.pl.in
index a0d7f28e..ba6a491a 100644
--- a/ldap/admin/src/scripts/template-ns-inactivate.pl.in
+++ b/ldap/admin/src/scripts/template-ns-inactivate.pl.in
@@ -396,7 +396,7 @@ $ENV{'PATH'} = "$prefix@ldaptool_bindir@:$prefix/usr/bin:@ldaptool_bindir@:/usr/
 $ENV{'LD_LIBRARY_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 $ENV{'SHLIB_PATH'} = "$prefix@nss_libdir@:$prefix/usr/lib:@nss_libdir@:/usr/lib";
 
-$ldapsearch="ldapsearch @ldaptool_opts@ -1";
+$ldapsearch="ldapsearch @ldaptool_opts@ @plainldif_opts@";
 $ldapmodify="ldapmodify @ldaptool_opts@";
  
 # Default values
diff --git a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
index ab18ae4c..5d158bd0 100755
--- a/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
+++ b/ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in
@@ -69,7 +69,7 @@ $opt_h = "{{SERVER-NAME}}";
 $opt_v = 0;
 
 # Variables
-$ldapsearch="ldapsearch @ldaptool_opts@ -1";
+$ldapsearch="ldapsearch @ldaptool_opts@ @plainldif_opts@";
 $ldapmodify="ldapmodify @ldaptool_opts@";
 
 #############################################################################
diff --git a/m4/mozldap.m4 b/m4/mozldap.m4
index c1744b49..23df0601 100644
--- a/m4/mozldap.m4
+++ b/m4/mozldap.m4
@@ -171,4 +171,6 @@ dnl default path for the ldap c sdk tools (see [210947] for more details)
   ldaptool_bindir=$ldapsdk_bindir
   # default options to pass to the tools
   ldaptool_opts=
+  # get plain output from ldapsearch - no version
+  plainldif_opts=-1
 fi
diff --git a/m4/openldap.m4 b/m4/openldap.m4
index c9a3a1e5..7fdb979a 100644
--- a/m4/openldap.m4
+++ b/m4/openldap.m4
@@ -151,4 +151,6 @@ if test "$with_openldap" = yes ; then
   # default options to pass to the tools
   # use -x because all of our scripts use simple bind
   ldaptool_opts=-x
+  # get plain output from ldapsearch - no version, no comments
+  plainldif_opts=-LLL
 fi