diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2006-06-13 20:31:32 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2006-06-13 20:31:32 +0000 |
| commit | 905575123fd1ac39d22c0480f8758e830baddba8 (patch) | |
| tree | ab2a25b1bc0c72c4385755721108ead4fa216491 /lisp/net | |
| parent | c74849812bb1e16ce0ee75c734f9c07a69649c4e (diff) | |
| download | emacs-905575123fd1ac39d22c0480f8758e830baddba8.tar.gz | |
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.
Diffstat (limited to 'lisp/net')
| -rw-r--r-- | lisp/net/ldap.el | 6 |
1 files changed, 3 insertions, 3 deletions
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 |