Mercurial > emacs
changeset 71331:f4495654b2ad
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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 13 Jun 2006 20:31:32 +0000 |
| parents | 2152d95360fb |
| children | 09e601998e13 |
| files | lisp/ChangeLog lisp/net/ldap.el |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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):
--- 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