procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* net/ldap.el (ldap-ldapsearch-args): Default to SASL search.
	(ldap-search-internal): Keep error messages, and a regexp fix.
This commit is contained in:
Chong Yidong 2006-06-13 20:31:32 +00:00
parent c74849812b
commit 905575123f
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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):

6
lisp/net/ldap.el
View file

@ -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