# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1150230692 0
# Node ID f4495654b2adfc586a024bc990a6c98d2e8d83ab
# Parent  2152d95360fba24117e34bac36684d59571df15b
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 -r 2152d95360fb -r f4495654b2ad lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jun 13 14:02:21 2006 +0000
+++ b/lisp/ChangeLog	Tue Jun 13 20:31:32 2006 +0000
@@ -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 -r 2152d95360fb -r f4495654b2ad lisp/net/ldap.el
--- a/lisp/net/ldap.el	Tue Jun 13 14:02:21 2006 +0000
+++ b/lisp/net/ldap.el	Tue Jun 13 20:31:32 2006 +0000
@@ -154,7 +154,7 @@
   :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 @@
 	  (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 @@
 					       (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