From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Thu, 22 Nov 2007 20:26:33 +0000 (+0000)
Subject: (smime-cert-by-ldap-1): Use `ldap-search' instead of
X-Git-Tag: emacs-pretest-23.0.90~9540
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=145cc6b9ea127439b239ffddbcbbf687170b759c;p=emacs.git

(smime-cert-by-ldap-1): Use `ldap-search' instead of
`smime-ldap-search' for Emacs 22 and up.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f2c2b7d8e95..d6b555cf234 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* gnus-art.el (gnus-article-truncate-lines): Use `truncate-lines'.
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 592500d5dec..f58339ed58f 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -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)