2 files changed, 5 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d8052855640..b967f5959d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-01-16  Pavel Jan,Bm(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 7e8f8241e61..03923eb4114 100644
--- 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")