aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2006-09-28 16:27:23 +0000
committerMarcus Brinkmann <[email protected]>2006-09-28 16:27:23 +0000
commit4677bde1339024ba2ac0c6d01c9e675e3b764984 (patch)
tree41b6aa3de66c06f574cf66ed7c4c7bdbd1a5b02e
parent2006-09-19 Marcus Brinkmann <[email protected]> (diff)
downloadlibassuan-4677bde1339024ba2ac0c6d01c9e675e3b764984.tar.gz
libassuan-4677bde1339024ba2ac0c6d01c9e675e3b764984.zip
2006-09-28 Marcus Brinkmann <[email protected]>
* assuan-client.c (assuan_transact): Do not convert error on status line, it is already a gpg-error. Do convert ASSUAN_Server_Fault.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/assuan-client.c4
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 <[email protected]>
+
+ * 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 <[email protected]>
* 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)
{