Mercurial > emacs

comparison lisp/url/url-ldap.el @ 83219:e86fc76a45e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 14 Oct 2004 14:42:03 +0000
parents eb7e8d483840 202c408c174b
children 9deb6323655c
comparison
equal deleted inserted replaced
83218:47f53c5c9620 83219:e86fc76a45e4
26 26
27 (require 'url-vars) 27 (require 'url-vars)
28 (require 'url-parse) 28 (require 'url-parse)
29 (require 'url-util) 29 (require 'url-util)
30 (require 'ldap) 30 (require 'ldap)
31 (autoload 'tls-certificate-information "tls")
31 32
32 ;; This has been implemented from RFC2255 'The LDAP URL Format' (Dec 1997) 33 ;; This has been implemented from RFC2255 'The LDAP URL Format' (Dec 1997)
33 ;; 34 ;;
34 ;; basic format is: ldap://host:port/dn?attributes?scope?filter?extensions 35 ;; basic format is: ldap://host:port/dn?attributes?scope?filter?extensions
35 ;; 36 ;;
94 (defun url-ldap-certificate-formatter (data) 95 (defun url-ldap-certificate-formatter (data)
95 (condition-case () 96 (condition-case ()
96 (require 'ssl) 97 (require 'ssl)
97 (error nil)) 98 (error nil))
98 (let ((vals (if (fboundp 'ssl-certificate-information) 99 (let ((vals (if (fboundp 'ssl-certificate-information)
99 (ssl-certificate-information data)))) 100 (ssl-certificate-information data)
101 (tls-certificate-information data))))
100 (if (not vals) 102 (if (not vals)
101 "<b>Unable to parse certificate</b>" 103 "<b>Unable to parse certificate</b>"
102 (concat "<table border=0>\n" 104 (concat "<table border=0>\n"
103 (mapconcat 105 (mapconcat
104 (lambda (ava) 106 (lambda (ava)