[Pkg-gnupg-commit] [libassuan] 165/437: 2006-09-28 Marcus Brinkmann <marcus at g10code.de>

[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 4677bde1339024ba2ac0c6d01c9e675e3b764984
Author: Marcus Brinkmann <mb at g10code.com>
Date:   Thu Sep 28 16:27:23 2006 +0000

    2006-09-28  Marcus Brinkmann  <marcus at g10code.de>
    
    	* assuan-client.c (assuan_transact): Do not convert error on
    	status line, it is already a gpg-error.  Do convert
    	ASSUAN_Server_Fault.
---
 src/ChangeLog       | 6 ++++++
 src/assuan-client.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 8b90fc2..12ef77e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-28  Marcus Brinkmann  <marcus at g10code.de>
+
+	* assuan-client.c (assuan_transact): Do not convert error on
+	status line, it is already a gpg-error.  Do convert
+	ASSUAN_Server_Fault.
+
 2006-09-19  Marcus Brinkmann  <marcus at g10code.de>
 
 	* assuan.h (assuan_init_socket_server_ext)
diff --git a/src/assuan-client.c b/src/assuan-client.c
index 06e3966..a4ee967 100644
--- a/src/assuan-client.c
+++ b/src/assuan-client.c
@@ -161,9 +161,9 @@ assuan_transact (assuan_context_t ctx,
 
   if (!okay)
     {
-      rc = _assuan_error (atoi (line));
+      rc = atoi (line);
       if (rc < 100)
-        rc = ASSUAN_Server_Fault;
+        rc = _assuan_error (ASSUAN_Server_Fault);
     }
   else if (okay == 2)
     {

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