aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-02-05 19:18:03 +0000
committerEli Zaretskii2005-02-05 19:18:03 +0000
commit7ce59e837437107dff8b5da62d351fd3eec9a69f (patch)
tree820015eae9229b6c1b022e98a03c2ce7f81ac062
parent9bf6d576a798f47ab6c0716335ed13c7fa90196f (diff)
downloademacs-7ce59e837437107dff8b5da62d351fd3eec9a69f.tar.gz
emacs-7ce59e837437107dff8b5da62d351fd3eec9a69f.zip
(ldap-search-internal): Support attributes with
optional descriptions separated by a semi-colon, as in "userCertificate;binary".
-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."
579 (end-of-line) 579 (end-of-line)
580 (point)))) 580 (point))))
581 (forward-line 1) 581 (forward-line 1)
582 (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$") 582 (while (looking-at "^\\(\\w*\\)\\(;\\w*\\)?[=:\t ]+\\(<[\t ]*file://\\)?\\(.*\\)$")
583 (setq name (match-string 1) 583 (setq name (match-string 1)
584 value (match-string 3)) 584 value (match-string 4))
585 ;; Need to handle file:///D:/... as generated by OpenLDAP 585 ;; Need to handle file:///D:/... as generated by OpenLDAP
586 ;; on DOS/Windows as local files. 586 ;; on DOS/Windows as local files.
587 (if (and (memq system-type '(windows-nt ms-dos)) 587 (if (and (memq system-type '(windows-nt ms-dos))