diff options
| author | Werner Koch <[email protected]> | 2023-12-22 12:45:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-12-22 12:45:02 +0000 |
| commit | 2764ee309a2e0c10cef606345f06dd37c637fc41 (patch) | |
| tree | 4238a756e7624b31ade6e558a1c0794af691412d /kbx/kbx-client-util.c | |
| parent | Register DCO for Mario Haustein (diff) | |
| parent | doc: Explain why socket activation is a problem (diff) | |
| download | gnupg-2764ee309a2e0c10cef606345f06dd37c637fc41.tar.gz gnupg-2764ee309a2e0c10cef606345f06dd37c637fc41.zip | |
Merge branch 'STABLE-BRANCH-2-4'
--
Fixed conflicts in
NEWS
g10/encrypt.c
sm/encrypt.c
sm/sign.c
Diffstat (limited to 'kbx/kbx-client-util.c')
| -rw-r--r-- | kbx/kbx-client-util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c index 2ea3f5ef7..b900586c8 100644 --- a/kbx/kbx-client-util.c +++ b/kbx/kbx-client-util.c @@ -405,10 +405,10 @@ kbx_client_data_cmd (kbx_client_data_t kcd, const char *command, status_cb, status_cb_value); if (err) { - if (gpg_err_code (err) != GPG_ERR_NOT_FOUND - && gpg_err_code (err) != GPG_ERR_NOTHING_FOUND) - log_debug ("%s: finished command with error: %s\n", - __func__, gpg_strerror (err)); + /* if (gpg_err_code (err) != GPG_ERR_NOT_FOUND */ + /* && gpg_err_code (err) != GPG_ERR_NOTHING_FOUND) */ + /* log_debug ("%s: finished command with error: %s\n", */ + /* __func__, gpg_strerror (err)); */ xfree (get_membuf (&mb, &len)); kcd->dlineerr = err; goto leave; |