diff options
| author | Jens Schmidt <jschmidt4gnu@vodafonemail.de> | 2023-06-16 00:04:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-06-17 10:57:42 +0300 |
| commit | d2246b2627531523dc0decd6bee863820dd2f5bf (patch) | |
| tree | d5f3215bbc9f1305ebb8a942e81e6d6d895a233b | |
| parent | 84d2da003e1c2acc2dddd7b6bc271cb6e1af9755 (diff) | |
| download | emacs-d2246b2627531523dc0decd6bee863820dd2f5bf.tar.gz | |
Fix parsing of dn line if WITHDN is non-nil
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)
| -rw-r--r-- | lisp/net/ldap.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index 78405414a28..4275b45e6f5 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -703,7 +703,17 @@ an alist of attribute/value pairs." (while (progn (skip-chars-forward " \t\n") (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) (while (looking-at "^\\([A-Za-z][-A-Za-z0-9]*\ \\|[0-9]+\\(?:\\.[0-9]+\\)*\\)\\(;[-A-Za-z0-9]+\\)*[=:\t ]+\ |