From 53d33af8cc3c2c089d82f949e9b1edf5965fabcd Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 4 Oct 2006 17:03:36 +0000 Subject: Littel fix to make Cancel returns from pinnetry work again. (At least with the forthcoming gnupg 1.9.91) --- NEWS | 4 ++++ configure.ac | 2 +- src/ChangeLog | 5 +++++ src/assuan-client.c | 4 +++- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 69e74c5..bb3359b 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +Noteworthy changes in version 0.9.2 +------------------------------------------------ + + Noteworthy changes in version 0.9.1 (2006-10-04) ------------------------------------------------ diff --git a/configure.ac b/configure.ac index 46a0d86..43e3d1d 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ min_automake_version="1.9.3" # Version number: Remember to change it immediately *after* a release. # Add a "-cvs" prefix for non-released code. -AC_INIT(libassuan, 0.9.1, gnupg-devel@gnupg.org) +AC_INIT(libassuan, 0.9.2-cvs, gnupg-devel@gnupg.org) # Note, that this is not yet available as a shared library. PACKAGE=$PACKAGE_NAME diff --git a/src/ChangeLog b/src/ChangeLog index 12ef77e..9b0cb74 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2006-10-04 Werner Koch + + * assuan-client.c (assuan_transact): Need to map old assuan status + codes so that for example CANCELED is correctly mapped. + 2006-09-28 Marcus Brinkmann * assuan-client.c (assuan_transact): Do not convert error on diff --git a/src/assuan-client.c b/src/assuan-client.c index a4ee967..978c695 100644 --- a/src/assuan-client.c +++ b/src/assuan-client.c @@ -162,8 +162,10 @@ assuan_transact (assuan_context_t ctx, if (!okay) { rc = atoi (line); - if (rc < 100) + if (rc > 0 && rc < 100) rc = _assuan_error (ASSUAN_Server_Fault); + else if (rc > 0 && rc <= 128) + rc = _assuan_error (rc); } else if (okay == 2) { -- cgit v1.2.3