diff options
| author | Werner Koch <wk@gnupg.org> | 2019-06-03 16:31:58 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2019-06-03 16:33:10 +0200 |
| commit | f2ac6742d403a5a95d84ac7cdcf8913c39297bcb (patch) | |
| tree | 05fd0377e546f0a8e6ed62fbadd4624415368f7b /agent | |
| parent | agent: Add A-flag for KEYINFO output for card. (diff) | |
| download | gnupg2-f2ac6742d403a5a95d84ac7cdcf8913c39297bcb.tar.xz gnupg2-f2ac6742d403a5a95d84ac7cdcf8913c39297bcb.zip | |
Return better error code for some getinfo IPC commands.
* agent/command.c (cmd_getinfo): Return GPG_ERR_FALSE as boolean False.
* g13/server.c (cmd_getinfo): Ditto.
* sm/server.c (cmd_getinfo): Ditto.
--
GPG_ERR_FALSE was introduced with libgpg-error 1.21 and we now require
a later version for gnupg 2. Thus we can switch to this more
descriptive code.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/command.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/agent/command.c b/agent/command.c index 460aa1dec..3c2da183c 100644 --- a/agent/command.c +++ b/agent/command.c @@ -3110,7 +3110,7 @@ cmd_getinfo (assuan_context_t ctx, char *line) { cmdopt = line; if (!command_has_option (cmd, cmdopt)) - rc = gpg_error (GPG_ERR_GENERAL); + rc = gpg_error (GPG_ERR_FALSE); } } } @@ -3124,7 +3124,7 @@ cmd_getinfo (assuan_context_t ctx, char *line) } else if (!strcmp (line, "restricted")) { - rc = ctrl->restricted? 0 : gpg_error (GPG_ERR_GENERAL); + rc = ctrl->restricted? 0 : gpg_error (GPG_ERR_FALSE); } else if (ctrl->restricted) { @@ -3158,7 +3158,7 @@ cmd_getinfo (assuan_context_t ctx, char *line) } else if (!strcmp (line, "scd_running")) { - rc = agent_scd_check_running ()? 0 : gpg_error (GPG_ERR_GENERAL); + rc = agent_scd_check_running ()? 0 : gpg_error (GPG_ERR_FALSE); } else if (!strcmp (line, "std_env_names")) { |