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

Fix parsing of dn line if WITHDN is non-nil

Browse source 
Function `ldap-search' errors out with `wrong-type-argument listp'
when called with WITHDN non-nil.
* lisp/net/ldap.el (ldap-search-internal): Parse the dn line
correctly so that `ldap-search' can grok it.  (Bug#64089)
This commit is contained in:
Jens Schmidt 2023-06-16 00:04:04 +02:00 • committed by Eli Zaretskii
parent 84d2da003e
commit d2246b2627
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lisp/net/ldap.el
View file

@ -703,7 +703,17 @@ an alist of attribute/value pairs."
(while (progn (while (progn
(skip-chars-forward " \t\n") (skip-chars-forward " \t\n")
(not (eobp))) (not (eobp)))
(setq dn (buffer-substring (point) (line-end-position))) ;; Ignore first (dn) line if WITHDN equals nil. If WITHDN
;; is non-nil, check syntax of the line and split it into a
;; pair as expected by `ldap-decode-attribute' (Bug#64089).
;; If the syntax is wrong, better throw an error here, since
;; otherwise `ldap-decode-attribute' would throw a much less
;; comprehensible error later.
(cond ((not withdn))
((looking-at "^dn[=:\t ]+\\(.*\\)$")
(setq dn (list "dn" (match-string 1))))
(t (error "Incorrect dn line \"%s\" in ldapsearch result"
(buffer-substring (point) (line-end-position)))))
(forward-line 1) (forward-line 1)
(while (looking-at "^\\([A-Za-z][-A-Za-z0-9]*\ (while (looking-at "^\\([A-Za-z][-A-Za-z0-9]*\
\\|[0-9]+\\(?:\\.[0-9]+\\)*\\)\\(;[-A-Za-z0-9]+\\)*[=:\t ]+\ \\|[0-9]+\\(?:\\.[0-9]+\\)*\\)\\(;[-A-Za-z0-9]+\\)*[=:\t ]+\