[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/smime.el,v
From: |
Reiner Steib |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/smime.el,v |
Date: |
Thu, 22 Nov 2007 20:26:35 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Reiner Steib <rsteib> 07/11/22 20:26:35
Index: smime.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/smime.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- smime.el 16 Nov 2007 16:50:31 -0000 1.15
+++ smime.el 22 Nov 2007 20:26:33 -0000 1.16
@@ -122,7 +122,6 @@
;;; Code:
(require 'dig)
-(require 'smime-ldap)
(require 'password)
(eval-when-compile (require 'cl))
@@ -589,7 +588,16 @@
(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)
+ (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)