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

`smime-ldap-search' for Emacs 22 and up.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d36dbe..296f4c3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-start.el (gnus-get-unread-articles): Mark groups as having never

diff --git a/lisp/smime.el b/lisp/smime.el
index ee62fd8..52774d6 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -122,7 +122,6 @@
 ;;; Code:
 
 (require 'dig)
-(require 'smime-ldap)
 (require 'password)
 (eval-when-compile (require 'cl))
 
@@ -590,8 +589,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)