summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2005-02-05 19:18:03 +0000
committerEli Zaretskii <eliz@gnu.org>2005-02-05 19:18:03 +0000
commit7ce59e837437107dff8b5da62d351fd3eec9a69f (patch)
tree820015eae9229b6c1b022e98a03c2ce7f81ac062 /lisp
parent9bf6d576a798f47ab6c0716335ed13c7fa90196f (diff)
downloademacs-7ce59e837437107dff8b5da62d351fd3eec9a69f.tar.gz
(ldap-search-internal): Support attributes with
optional descriptions separated by a semi-colon, as in "userCertificate;binary".
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/ldap.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index f093fb1cbcc..16af42ffc27 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -579,9 +579,9 @@ an alist of attribute/value pairs."
(end-of-line)
(point))))
(forward-line 1)
- (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
+ (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
(setq name (match-string 1)
- value (match-string 3))
+ value (match-string 4))
;; Need to handle file:///D:/... as generated by OpenLDAP
;; on DOS/Windows as local files.
(if (and (memq system-type '(windows-nt ms-dos))