diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2010-08-12 17:52:57 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2010-08-31 13:35:54 -0600 |
| commit | a5564abf94f8951a8a3ce6fa51b5e2f26b617711 (patch) | |
| tree | 694fb13fbac690075676f549a770e2393f406f2f /ldap | |
| parent | 17d86aef5a9a718857a03e9c8ada870fb65b84ce (diff) | |
| download | ds-a5564abf94f8951a8a3ce6fa51b5e2f26b617711.tar.gz ds-a5564abf94f8951a8a3ce6fa51b5e2f26b617711.tar.xz ds-a5564abf94f8951a8a3ce6fa51b5e2f26b617711.zip | |
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
Diffstat (limited to 'ldap')
4 files changed, 4 insertions, 4 deletions
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@"; ############################################################################# |