security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Werner Koch 2019-06-03 16:31:58 +02:00
parent 6790eaf952
commit f2ac6742d4
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/command.c
View File

@ -3110,7 +3110,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
{ {
cmdopt = line; cmdopt = line;
if (!command_has_option (cmd, cmdopt)) 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")) 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) else if (ctrl->restricted)
{ {
@ -3158,7 +3158,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
} }
else if (!strcmp (line, "scd_running")) 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")) else if (!strcmp (line, "std_env_names"))
{ {

2
g13/server.c
View File

@ -530,7 +530,7 @@ cmd_getinfo (assuan_context_t ctx, char *line)
{ {
cmdopt = line; cmdopt = line;
if (!command_has_option (cmd, cmdopt)) if (!command_has_option (cmd, cmdopt))
err = gpg_error (GPG_ERR_GENERAL); err = gpg_error (GPG_ERR_FALSE);
} }
} }
} }

4
sm/server.c
View File

@ -1162,14 +1162,14 @@ cmd_getinfo (assuan_context_t ctx, char *line)
{ {
cmdopt = line; cmdopt = line;
if (!command_has_option (cmd, cmdopt)) if (!command_has_option (cmd, cmdopt))
rc = gpg_error (GPG_ERR_GENERAL); rc = gpg_error (GPG_ERR_FALSE);
} }
} }
} }
} }
else if (!strcmp (line, "offline")) else if (!strcmp (line, "offline"))
{ {
rc = ctrl->offline? 0 : gpg_error (GPG_ERR_GENERAL); rc = ctrl->offline? 0 : gpg_error (GPG_ERR_FALSE);
} }
else else
rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT"); rc = set_error (GPG_ERR_ASS_PARAMETER, "unknown value for WHAT");