[Pkg-gnupg-commit] [libassuan] 167/437: Littel fix to make Cancel returns from pinnetry work again. (At least with the forthcoming gnupg 1.9.91)

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository libassuan.

commit 53d33af8cc3c2c089d82f949e9b1edf5965fabcd
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 4 17:03:36 2006 +0000

    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 at gnupg.org)
+AC_INIT(libassuan, 0.9.2-cvs, gnupg-devel at 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  <wk at g10code.com>
+
+	* 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  <marcus at g10code.de>
 
 	* 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)
     {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/libassuan.git