From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 5 Feb 2005 19:18:03 +0000 (+0000)
Subject: (ldap-search-internal): Support attributes with
X-Git-Tag: ttn-vms-21-2-B4~2405
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ce59e837437107dff8b5da62d351fd3eec9a69f;p=emacs.git

(ldap-search-internal): Support attributes with
optional descriptions separated by a semi-colon, as in
"userCertificate;binary".
---

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))