From a5564abf94f8951a8a3ce6fa51b5e2f26b617711 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 12 Aug 2010 17:52:57 -0600 Subject: 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 --- ldap/admin/src/scripts/template-ns-accountstatus.pl.in | 2 +- ldap/admin/src/scripts/template-ns-activate.pl.in | 2 +- ldap/admin/src/scripts/template-ns-inactivate.pl.in | 2 +- ldap/admin/src/scripts/template-ns-newpwpolicy.pl.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ldap/admin/src/scripts') 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@"; ############################################################################# -- cgit