aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-09-27 12:28:36 +0000
committerWerner Koch <[email protected]>2019-09-27 12:28:36 +0000
commit8e574130482167dc7d2e2888cc80ad6584345e3d (patch)
treeaed1a6c563b60dae10b9501a24b0a0fd4fc7a640
parentkbx: Store the UBIB in the blob. (diff)
downloadgnupg-switch-to-gpgk.tar.gz
gnupg-switch-to-gpgk.zip
kbx: Fix error code return in keyboxd.switch-to-gpgk
* kbx/frontend.c (kbxd_add_resource): Print a diagnostic on error. * kbx/backend-kbx.c (be_kbx_add_resource): Acttually returh the error code. Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--kbx/backend-kbx.c2
-rw-r--r--kbx/frontend.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/kbx/backend-kbx.c b/kbx/backend-kbx.c
index 851f2dadf..438d300b0 100644
--- a/kbx/backend-kbx.c
+++ b/kbx/backend-kbx.c
@@ -200,7 +200,7 @@ be_kbx_add_resource (ctrl_t ctrl, backend_handle_t *r_hd,
leave:
xfree (hd);
- return 0;
+ return err;
}
diff --git a/kbx/frontend.c b/kbx/frontend.c
index 806ff27db..6e0cbcb11 100644
--- a/kbx/frontend.c
+++ b/kbx/frontend.c
@@ -194,7 +194,11 @@ kbxd_add_resource (ctrl_t ctrl, const char *filename_arg, int readonly)
leave:
if (err)
- be_generic_release_backend (ctrl, handle);
+ {
+ log_error ("error adding resource '%s': %s\n",
+ filename, gpg_strerror (err));
+ be_generic_release_backend (ctrl, handle);
+ }
xfree (filename);
return err;
}