security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

keyboxd: New option --steal-socket.

Browse Source 
* kbx/keyboxd.c (oStealSocket): New const.
(opts): Add option.
(steal_socket): New file global flag.
(main): Set option.
(create_server_socket): Implement option.
--
This commit is contained in:
Werner Koch 2021-11-13 15:01:17 +01:00
parent dd708f60d5
commit b0079ab39d
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kbx/keyboxd.c
View File

@ -84,6 +84,7 @@ enum cmd_and_opt_values
oNoOptions, oNoOptions,
oHomedir, oHomedir,
oNoDetach, oNoDetach,
oStealSocket,
oLogFile, oLogFile,
oServer, oServer,
oDaemon, oDaemon,
@ -104,6 +105,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")), ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")),
ARGPARSE_s_n (oServer, "server", N_("run in server mode (foreground)")), ARGPARSE_s_n (oServer, "server", N_("run in server mode (foreground)")),
ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")), ARGPARSE_s_n (oNoDetach, "no-detach", N_("do not detach from the console")),
ARGPARSE_s_n (oStealSocket, "steal-socket", "@"),
ARGPARSE_s_s (oHomedir, "homedir", "@"), ARGPARSE_s_s (oHomedir, "homedir", "@"),
ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")), ARGPARSE_conffile (oOptions, "options", N_("|FILE|read options from FILE")),
@ -171,6 +173,9 @@ static int startup_signal_mask_valid;
/* Flag to indicate that a shutdown was requested. */ /* Flag to indicate that a shutdown was requested. */
static int shutdown_pending; static int shutdown_pending;
/* Flag indicating to start the daemon even if one already runs. */
static int steal_socket;
/* Counter for the currently running own socket checks. */ /* Counter for the currently running own socket checks. */
static int check_own_socket_running; static int check_own_socket_running;
@ -571,6 +576,7 @@ main (int argc, char **argv )
case oNoOptions: break; /* no-options */ case oNoOptions: break; /* no-options */
case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break; case oHomedir: gnupg_set_homedir (pargs.r.ret_str); break;
case oNoDetach: nodetach = 1; break; case oNoDetach: nodetach = 1; break;
case oStealSocket: steal_socket = 1; break;
case oLogFile: logfile = pargs.r.ret_str; break; case oLogFile: logfile = pargs.r.ret_str; break;
case oServer: pipe_server = 1; break; case oServer: pipe_server = 1; break;
case oDaemon: is_daemon = 1; break; case oDaemon: is_daemon = 1; break;
@ -1146,6 +1152,11 @@ create_server_socket (char *name, int cygwin, assuan_sock_nonce_t *nonce)
{ {
/* Check whether a keyboxd is already running. */ /* Check whether a keyboxd is already running. */
if (!check_for_running_kbxd (1)) if (!check_for_running_kbxd (1))
{
if (steal_socket)
log_info (N_("trying to steal socket from running %s\n"),
"keyboxd");
else
{ {
log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX); log_set_prefix (NULL, GPGRT_LOG_WITH_PREFIX);
log_set_file (NULL); log_set_file (NULL);
@ -1156,6 +1167,7 @@ create_server_socket (char *name, int cygwin, assuan_sock_nonce_t *nonce)
xfree (unaddr); xfree (unaddr);
kbxd_exit (2); kbxd_exit (2);
} }
}
gnupg_remove (unaddr->sun_path); gnupg_remove (unaddr->sun_path);
rc = assuan_sock_bind (fd, addr, len); rc = assuan_sock_bind (fd, addr, len);
} }