[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 2bad5829ff7: Revert "Fix parsing of dn line if WITHDN is non-ni
From: |
Filipp Gunbin |
Subject: |
emacs-29 2bad5829ff7: Revert "Fix parsing of dn line if WITHDN is non-nil" |
Date: |
Tue, 20 Jun 2023 11:26:13 -0400 (EDT) |
branch: emacs-29
commit 2bad5829ff76538774676f7274f40ce7baf04c73
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Filipp Gunbin <fgunbin@fastmail.fm>
Revert "Fix parsing of dn line if WITHDN is non-nil"
This reverts commits 71b27779a9a and d2246b26275, because they change
the return value of "ldap-search" in an incompatible way. The fix
(a different one) will be done on master instead (bug#64089).
---
lisp/net/ldap.el | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 8897c3b6d54..78405414a28 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -703,17 +703,7 @@ an alist of attribute/value pairs."
(while (progn
(skip-chars-forward " \t\n")
(not (eobp)))
- ;; 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)))))
+ (setq dn (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 ]+\
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 2bad5829ff7: Revert "Fix parsing of dn line if WITHDN is non-nil",
Filipp Gunbin <=