Index: lisp/ChangeLog
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v
retrieving revision 7.721
diff -u -p -r7.721 ChangeLog
--- lisp/ChangeLog	16 Jun 2005 06:01:42 -0000	7.721
+++ lisp/ChangeLog	16 Jun 2005 08:19:23 -0000
@@ -1,3 +1,9 @@
+2005-06-16  Arne J,Ax(Brgensen  <arne@arnested.dk>
+
+	* smime.el (smime-cert-by-ldap-1): Detect PEM format by doing a
+	`base64-encode-string' of the `base64-decode-string'ed string
+	because XEmacs doesn't always fail on `base64-decode-string'.
+
 2005-06-16  Miles Bader  <miles@gnu.org>
 
 	* gnus-xmas.el (gnus-xmas-group-startup-message):
Index: lisp/smime.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/smime.el,v
retrieving revision 7.14
diff -u -p -r7.14 smime.el
--- lisp/smime.el	31 May 2005 13:01:59 -0000	7.14
+++ lisp/smime.el	16 Jun 2005 08:19:23 -0000
@@ -600,7 +600,10 @@ A string or a list of strings is returne
 	  (if (or (string= (substring (cadaar ldapresult) 0 27)
 			   "-----BEGIN CERTIFICATE-----")
 		  (condition-case nil
-		      (base64-decode-string (cadaar ldapresult))
+		      (string=
+		       (cadaar ldapresult)
+		       (base64-encode-string
+			(base64-decode-string (cadaar ldapresult))))
 		    (error nil)))
 	      (setq cert
 		    (smime-replace-in-string