aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
authorNot Zed <NotZed@Ximian.com>2004-02-27 13:44:56 +0800
committerMichael Zucci <zucchi@src.gnome.org>2004-02-27 13:44:56 +0800
commit4a67162ad86d2b53c116f93b9e7231cbffb730bb (patch)
tree2b0782289e4c2bba6a5c5c8097d8f5609747f873 /camel
parentdd4b6354aa8316c913d235b443381931ac62f18b (diff)
downloadgsoc2013-evolution-4a67162ad86d2b53c116f93b9e7231cbffb730bb.tar.gz
gsoc2013-evolution-4a67162ad86d2b53c116f93b9e7231cbffb730bb.tar.zst
gsoc2013-evolution-4a67162ad86d2b53c116f93b9e7231cbffb730bb.zip
ignore NODATA response, otherwise we abort in a meaningless way. See
2004-02-27 Not Zed <NotZed@Ximian.com> * camel-gpg-context.c (gpg_ctx_parse_status): ignore NODATA response, otherwise we abort in a meaningless way. See #52939. svn path=/trunk/; revision=24904
Diffstat (limited to 'camel')
-rw-r--r--camel/camel-gpg-context.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
index 306211ab99..9f55fc4b65 100644
--- a/camel/camel-gpg-context.c
+++ b/camel/camel-gpg-context.c
@@ -55,7 +55,7 @@
#include "camel-multipart-signed.h"
#include "camel-multipart-encrypted.h"
-#define d(x)
+#define d(x)
static CamelCipherContextClass *parent_class = NULL;
@@ -805,15 +805,7 @@ gpg_ctx_parse_status (struct _GpgCtx *gpg, CamelException *ex)
return -1;
} else if (!strncmp (status, "NODATA", 6)) {
/* this is an error */
- const char *diagnostics;
-
- diagnostics = gpg_ctx_get_diagnostics (gpg);
- if (diagnostics && *diagnostics)
- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, diagnostics);
- else
- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,
- _("No data provided"));
- return -1;
+ /* But we ignore it anyway, we should get other response codes to say why */
} else {
/* check to see if we are complete */
switch (gpg->mode) {