summaryrefslogtreecommitdiffstats
path: root/sm
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2004-12-18 11:22:10 +0100
committerWerner Koch <wk@gnupg.org>2004-12-18 11:22:10 +0100
commit3666a2859bd31115708b027cb69fa824c8111de4 (patch)
tree97d6df62972435b0b200232225553377bbcb005c /sm
parent2004-12-17 Moritz Schulte <moritz@g10code.com> (diff)
downloadgnupg2-3666a2859bd31115708b027cb69fa824c8111de4.tar.xz
gnupg2-3666a2859bd31115708b027cb69fa824c8111de4.zip
Avoid the " map_to_assuan_status called with no error source" diagnostic.
Diffstat (limited to 'sm')
-rw-r--r--sm/ChangeLog7
-rw-r--r--sm/call-agent.c2
-rw-r--r--sm/gpgsm.h3
3 files changed, 11 insertions, 1 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index b28c45af8..167ec8753 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-18 Werner Koch <wk@g10code.com>
+
+ * gpgsm.h (map_assuan_err): Define in terms of
+ map_assuan_err_with_source.
+ * call-agent.c (start_agent): Pass error source to
+ send_pinentry_environment.
+
2004-12-17 Werner Koch <wk@g10code.com>
* call-dirmngr.c (isvalid_status_cb, lookup_status_cb)
diff --git a/sm/call-agent.c b/sm/call-agent.c
index 3ea1c4565..0d15a5595 100644
--- a/sm/call-agent.c
+++ b/sm/call-agent.c
@@ -168,7 +168,7 @@ start_agent (ctrl_t ctrl)
if (rc)
return map_assuan_err (rc);
- return send_pinentry_environment (agent_ctx,
+ return send_pinentry_environment (agent_ctx, GPG_ERR_SOURCE_DEFAULT,
opt.display, opt.ttyname, opt.ttytype,
opt.lc_ctype, opt.lc_messages);
}
diff --git a/sm/gpgsm.h b/sm/gpgsm.h
index fe4e93910..17ad21ed6 100644
--- a/sm/gpgsm.h
+++ b/sm/gpgsm.h
@@ -26,6 +26,9 @@
#endif
#define GPG_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GPGSM
#include <gpg-error.h>
+#define map_assuan_err(a) \
+ map_assuan_err_with_source (GPG_ERR_SOURCE_DEFAULT, (a))
+
#include <ksba.h>
#include "../common/util.h"