2006-06-13 Martin J. Reed <mjreed@essex.ac.uk> (tiny change)

	* net/ldap.el (ldap-ldapsearch-args): Default to SASL search.
	(ldap-search-internal): Keep error messages, and a regexp fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad37f74b87b0439de85eae40bfaf795bae5f198b..4db176fb5be219e66375919f156fb20233ee0833 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-13  Martin J. Reed  <mjreed@essex.ac.uk>  (tiny change)
+
+       * net/ldap.el (ldap-ldapsearch-args): Default to SASL search.
+       (ldap-search-internal): Keep error messages, and a regexp fix.
+
 2006-06-12  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * files.el (hack-local-variables-confirm):

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 180e14fcc20d325b7eaee18fc5db9e5f9b9b26b8..2a63615a602ffef5856165dadc8f47cb9e1a7b45 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -154,7 +154,7 @@ Valid properties include:
   :type '(string :tag "`ldapsearch' Program")
   :group 'ldap)
 
-(defcustom ldap-ldapsearch-args '("-LL" "-tt" "-x")
+(defcustom ldap-ldapsearch-args '("-LL" "-tt")
   "*A list of additional arguments to pass to `ldapsearch'."
   :type '(repeat :tag "`ldapsearch' Arguments"
                 (string :tag "Argument"))
@@ -555,7 +555,7 @@ an alist of attribute/value pairs."
          (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
       (eval `(call-process ldap-ldapsearch-prog
                           nil
-                          `(,buf nil)
+                          buf
                           nil
                           ,@arglist
                           ,@ldap-ldapsearch-args
@@ -580,7 +580,7 @@ an alist of attribute/value pairs."
                                               (end-of-line)
                                               (point))))
          (forward-line 1)
-         (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
+         (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)\\(.*\\)$")
            (setq name (match-string 1)
                  value (match-string 4))
             ;; Need to handle file:///D:/... as generated by OpenLDAP