aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2003-10-06 19:12:50 +0000
committerMarcus Brinkmann <[email protected]>2003-10-06 19:12:50 +0000
commitccb90f4e4d70acdf698e4048454728fc4431a81d (patch)
treeafa128de056038b5ae8efc89f5af166c660313ad
parent2003-10-06 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-ccb90f4e4d70acdf698e4048454728fc4431a81d.tar.gz
gpgme-ccb90f4e4d70acdf698e4048454728fc4431a81d.zip
2003-10-06 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (map_assuan_error): If ERR is -1, return sensible error.
-rw-r--r--gpgme/ChangeLog3
-rw-r--r--gpgme/engine-gpgsm.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index d2b82bd5..5c51973e 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,5 +1,8 @@
2003-10-06 Marcus Brinkmann <[email protected]>
+ * engine-gpgsm.c (map_assuan_error): If ERR is -1, return sensible
+ error.
+
* io.h (_gpgme_io_subsystem_init): New prototype.
* posix-io.c (_gpgme_io_subsystem_init): Add function.
(_gpgme_io_spawn): Do not fixup signal handler here.
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 270380a5..319e6261 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -152,6 +152,9 @@ close_notify_handler (int fd, void *opaque)
static gpgme_error_t
map_assuan_error (AssuanError err)
{
+ if (err == -1)
+ return gpg_error (GPG_ERR_GENERAL);
+
/* New code will use gpg_error_t values. */
if (gpg_err_source (err))
return (gpgme_error_t) err;