(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 f093fb1cbcc439c4a34425a5128d0b816b6ceefa..16af42ffc27eb4b5b866a89b6a1417fbcdbe5dce 100644 (file)
--- 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))