security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

gpgconf: Exit with failure if --launch fails.

Browse Source 
* tools/gpgconf-comp.c (gc_component_launch): Return an error code.
* tools/gpgconf.c (main): Exit if launch failed.
--
GnuPG-bug-id: 1791
This commit is contained in:
Werner Koch 2014-12-17 10:36:24 +01:00
parent b1b1923b06
commit 5cb6df8996
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/gpgconf-comp.c
View File

@ -1142,7 +1142,7 @@ dirmngr_runtime_change (int killflag)
/* Launch the gpg-agent or the dirmngr if not already running. */ /* Launch the gpg-agent or the dirmngr if not already running. */
void gpg_error_t
gc_component_launch (int component) gc_component_launch (int component)
{ {
gpg_error_t err; gpg_error_t err;
@ -1176,6 +1176,7 @@ gc_component_launch (int component)
" NOP", " NOP",
gpg_strerror (err)); gpg_strerror (err));
gnupg_release_process (pid); gnupg_release_process (pid);
return err;
} }

10
tools/gpgconf.c
View File

@ -281,10 +281,18 @@ main (int argc, char **argv)
exit (1); exit (1);
} }
else if (cmd == aLaunch) else if (cmd == aLaunch)
gc_component_launch (idx); {
if (gc_component_launch (idx))
exit (1);
}
else else
{
/* We don't error out if the kill failed because this
command should do nothing if the component is not
running. */
gc_component_kill (idx); gc_component_kill (idx);
} }
}
break; break;
case aReload: case aReload:

2
tools/gpgconf.h
View File

@ -45,7 +45,7 @@ char *gc_percent_escape (const char *src);
void gc_error (int status, int errnum, const char *fmt, ...); void gc_error (int status, int errnum, const char *fmt, ...);
/* Launch given component. */ /* Launch given component. */
void gc_component_launch (int component); gpg_error_t gc_component_launch (int component);
/* Kill given component. */ /* Kill given component. */
void gc_component_kill (int component); void gc_component_kill (int component);