(ldap-ldapsearch-prog): Default to OpenLDAP version 2 ldapsearch.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d80528556400b1775aea6353437dbfb2dc5051ab..b967f5959d97cba41f77bff30def4634e8de884c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-16  Pavel Jan\e,Bm\e(Bk  <Pavel@Janik.cz>
 
+       * net/ldap.el (ldap-ldapsearch-prog): Default to OpenLDAP version
+       2 ldapsearch.
+
        * net/eudc.el: New maintainer.  Change author's address.
        (eudc-pre-select-window-configuration, eudc-insertion-marker):
        Variables removed.

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 7e8f8241e611659c3b99f823db849a842d6f481d..03923eb4114289685e4c9b44025760a1cb04c8be 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -152,12 +152,8 @@ Valid properties include:
   :type '(string :tag "`ldapsearch' Program")
   :group 'ldap)
 
-(defcustom ldap-ldapsearch-args '("-B")
-  "*A list of additional arguments to pass to `ldapsearch'.
-It is recommended to use the `-T' switch with Netscape's
-implementation to avoid line wrapping.
-The `-B' switch should be used to enable the retrieval of
-binary values."
+(defcustom ldap-ldapsearch-args '("-LL" "-tt" "-x")
+  "*A list of additional arguments to pass to `ldapsearch'."
   :type '(repeat :tag "`ldapsearch' Arguments"
                 (string :tag "Argument"))
   :group 'ldap)
@@ -561,7 +557,6 @@ an alist of attribute/value pairs."
                           buf
                           nil
                           ,@arglist
-                          "-t"         ; Write values to temp files
                           ,@ldap-ldapsearch-args
                           ,@filter))
       (insert "\n")