From 905575123fd1ac39d22c0480f8758e830baddba8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 13 Jun 2006 20:31:32 +0000 Subject: [PATCH] 2006-06-13 Martin J. Reed (tiny change) * net/ldap.el (ldap-ldapsearch-args): Default to SASL search. (ldap-search-internal): Keep error messages, and a regexp fix. --- lisp/ChangeLog | 5 +++++ lisp/net/ldap.el | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ad37f74b87b..4db176fb5be 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-06-13 Martin J. Reed (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 * files.el (hack-local-variables-confirm): diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 180e14fcc20..2a63615a602 100644 --- 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 -- 2.39.5