mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Merge branch 'STABLE-BRANCH-2-4'
-- Fixed conflicts in NEWS g10/encrypt.c sm/encrypt.c sm/sign.c
This commit is contained in:
commit
2764ee309a
38 changed files with 1149 additions and 370 deletions
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue