Commit 145cc6b9 authored by Reiner Steib's avatar Reiner Steib

(smime-cert-by-ldap-1): Use `ldap-search' instead of

`smime-ldap-search' for Emacs 22 and up.
parent e3e72162
2007-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* smime.el (smime-cert-by-ldap-1): Use `ldap-search' instead of
`smime-ldap-search' for Emacs 22 and up.
2007-11-22 Stefan Monnier <monnier@iro.umontreal.ca>
* gnus-art.el (gnus-article-truncate-lines): Use `truncate-lines'.
......
......@@ -122,7 +122,6 @@
;;; Code:
(require 'dig)
(require 'smime-ldap)
(require 'password)
(eval-when-compile (require 'cl))
......@@ -589,8 +588,17 @@ A string or a list of strings is returned."
(defun smime-cert-by-ldap-1 (mail host)
"Get cetificate for MAIL from the ldap server at HOST."
(let ((ldapresult (smime-ldap-search (concat "mail=" mail)
host '("userCertificate") nil))
(let ((ldapresult
(funcall
(if (or (featurep 'xemacs)
;; For Emacs >= 22 we don't need smime-ldap.el
(< emacs-major-version 22))
(progn
(require 'smime-ldap)
'smime-ldap-search)
'ldap-search)
(concat "mail=" mail)
host '("userCertificate") nil))
(retbuf (generate-new-buffer (format "*certificate for %s*" mail)))
cert)
(if (and (>= (length ldapresult) 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment