From: ueno <ueno>
Date: Thu, 8 Mar 2007 03:04:01 +0000 (+0000)
Subject: Don't parse username as DN in USERID_HINT and IMPORTED status handlers.
X-Git-Tag: plaintext-branchpoint~8
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=499358e58bac39724a19f4fa03ddd1eb2b58f1d0;p=elisp%2Fepg.git

Don't parse username as DN in USERID_HINT and IMPORTED status handlers.
---

diff --git a/epg.el b/epg.el
index 0b4d7ca..659912a 100644
--- a/epg.el
+++ b/epg.el
@@ -1199,9 +1199,7 @@ This function is for internal use only."
 	     (user-id (match-string 2 string))
 	     (entry (assoc key-id epg-user-id-alist)))
 	(condition-case nil
-	    (if (eq (epg-context-protocol context) 'CMS)
-		(setq user-id (epg-dn-from-string user-id))
-	      (setq user-id (epg--decode-coding-string user-id 'utf-8)))
+	    (setq user-id (epg--decode-coding-string user-id 'utf-8))
 	  (error))
 	(if entry
 	    (setcdr entry user-id)
@@ -1586,9 +1584,7 @@ This function is for internal use only."
 	     (user-id (match-string 2 string))
 	     (entry (assoc key-id epg-user-id-alist)))
 	(condition-case nil
-	    (if (eq (epg-context-protocol context) 'CMS)
-		(setq user-id (epg-dn-from-string user-id))
-	      (setq user-id (epg--decode-coding-string user-id 'utf-8)))
+	    (setq user-id (epg--decode-coding-string user-id 'utf-8))
 	  (error))
 	(if entry
 	    (setcdr entry user-id)