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

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' \

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' \

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)

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

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

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

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@";
 
 #############################################################################

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

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