* mml-smime.el (mml-smime-get-ldap-cert): Renamed from

mml-smime-get-dns-ldap.
(mml-smime-encrypt-query): Use new function.  Default to ldap.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51080e8..545ccd4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-14  Simon Josefsson  <jas@extundo.com>
+
+       * mml-smime.el (mml-smime-get-ldap-cert): Renamed from
+       mml-smime-get-dns-ldap.
+       (mml-smime-encrypt-query): Use new function.  Default to ldap.
+
 2005-02-14  Arne J\e,Ax\e(Brgensen <arne@arnested.dk>
 
        * smime.el: Require smime-ldap.

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 5b54966..72f0e2e 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -115,7 +115,7 @@
       (quit))
     result))
 
-(defun mml-smime-get-dns-ldap ()
+(defun mml-smime-get-ldap-cert ()
   ;; todo: deal with comma separated multiple recipients
   (let (result who bad cert)
     (condition-case ()
@@ -140,12 +140,12 @@
   (let (certs done)
     (while (not done)
       (ecase (read (gnus-completing-read-with-default
-                   "dns" "Fetch certificate from"
+                   "ldap" "Fetch certificate from"
                    '(("dns") ("ldap") ("file")) nil t))
        (dns (setq certs (append certs
                                 (mml-smime-get-dns-cert))))
        (ldap (setq certs (append certs
-                                (mml-smime-get-dns-ldap))))
+                                 (mml-smime-get-ldap-cert))))
        (file (setq certs (append certs
                                  (mml-smime-get-file-cert)))))
       (setq done (not (y-or-n-p "Add more recipients? "))))