Mercurial > emacs
comparison lisp/gnus/smime.el @ 111573:e89dd9c3633b
merge trunk
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 08 Nov 2010 14:19:54 +0900 |
| parents | c8afa6dd9295 |
| children | 8db0bd23f378 |
comparison
equal
deleted
inserted
replaced
| 111572:b3f9490f0b7f | 111573:e89dd9c3633b |
|---|---|
| 585 (kill-buffer retbuf) | 585 (kill-buffer retbuf) |
| 586 (setq retbuf nil)) | 586 (setq retbuf nil)) |
| 587 (kill-buffer digbuf) | 587 (kill-buffer digbuf) |
| 588 retbuf)) | 588 retbuf)) |
| 589 | 589 |
| 590 (declare-function ldap-search "ldap" | |
| 591 (filter &optional host attributes attrsonly withdn)) | |
| 592 | |
| 590 (defun smime-cert-by-ldap-1 (mail host) | 593 (defun smime-cert-by-ldap-1 (mail host) |
| 591 "Get cetificate for MAIL from the ldap server at HOST." | 594 "Get cetificate for MAIL from the ldap server at HOST." |
| 592 (let ((ldapresult | 595 (let ((ldapresult |
| 593 (funcall | 596 (funcall |
| 594 (if (featurep 'xemacs) | 597 (if (featurep 'xemacs) |
| 595 (progn | 598 (progn |
| 596 (require 'smime-ldap) | 599 (require 'smime-ldap) |
| 597 'smime-ldap-search) | 600 'smime-ldap-search) |
| 598 'ldap-search) | 601 (progn |
| 602 (require 'ldap) | |
| 603 'ldap-search)) | |
| 599 (concat "mail=" mail) | 604 (concat "mail=" mail) |
| 600 host '("userCertificate") nil)) | 605 host '("userCertificate") nil)) |
| 601 (retbuf (generate-new-buffer (format "*certificate for %s*" mail))) | 606 (retbuf (generate-new-buffer (format "*certificate for %s*" mail))) |
| 602 cert) | 607 cert) |
| 603 (if (and (>= (length ldapresult) 1) | 608 (if (and (>= (length ldapresult) 1) |