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

Deprecate the --supervised options.

Browse Source 
* agent/gpg-agent.c (main): Mark --supervised as deprecated.
* dirmngr/dirmngr.c (main): Ditto.
--

The supervised thing causes more trouble than it pretends to solve.
This commit is contained in:
Werner Koch 2022-04-25 12:03:45 +02:00
parent 0f8623d518
commit ca5d5142c6
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/gpg-agent.c
View File

@ -167,7 +167,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)")),
#ifndef HAVE_W32_SYSTEM #ifndef HAVE_W32_SYSTEM
ARGPARSE_s_n (oSupervised, "supervised", N_("run in supervised mode")), ARGPARSE_s_n (oSupervised, "supervised", "@"),
#endif #endif
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 (oSh, "sh", N_("sh-style command output")), ARGPARSE_s_n (oSh, "sh", N_("sh-style command output")),
@ -1378,6 +1378,9 @@ main (int argc, char **argv)
agent_exit (0); agent_exit (0);
} }
if (is_supervised && !opt.quiet)
log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
if (is_supervised) if (is_supervised)
; ;
else if (!opt.extra_socket) else if (!opt.extra_socket)

5
dirmngr/dirmngr.c
View File

@ -173,7 +173,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_c (aServer, "server", N_("run in server mode (foreground)") ), ARGPARSE_c (aServer, "server", N_("run in server mode (foreground)") ),
ARGPARSE_c (aDaemon, "daemon", N_("run in daemon mode (background)") ), ARGPARSE_c (aDaemon, "daemon", N_("run in daemon mode (background)") ),
#ifndef HAVE_W32_SYSTEM #ifndef HAVE_W32_SYSTEM
ARGPARSE_c (aSupervised, "supervised", N_("run in supervised mode")), ARGPARSE_c (aSupervised, "supervised", "@"),
#endif #endif
ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")), ARGPARSE_c (aListCRLs, "list-crls", N_("list the contents of the CRL cache")),
ARGPARSE_c (aLoadCRL, "load-crl", N_("|FILE|load CRL from FILE into cache")), ARGPARSE_c (aLoadCRL, "load-crl", N_("|FILE|load CRL from FILE into cache")),
@ -1275,6 +1275,9 @@ main (int argc, char **argv)
#ifndef HAVE_W32_SYSTEM #ifndef HAVE_W32_SYSTEM
else if (cmd == aSupervised) else if (cmd == aSupervised)
{ {
if (!opt.quiet)
log_info(_("WARNING: \"%s\" is a deprecated option\n"), "--supervised");
/* In supervised mode, we expect file descriptor 3 to be an /* In supervised mode, we expect file descriptor 3 to be an
already opened, listening socket. already opened, listening socket.

3
doc/dirmngr.texi
View File

@ -90,8 +90,7 @@ general best to use @code{gpgconf --launch dirmngr}.
@opindex supervised @opindex supervised
Run in the foreground, sending logs to stderr, and listening on file Run in the foreground, sending logs to stderr, and listening on file
descriptor 3, which must already be bound to a listening socket. This descriptor 3, which must already be bound to a listening socket. This
is useful when running under systemd or other similar process option is deprecated and not supported on Windows.
supervision schemes. This option is not supported on Windows.
@item --list-crls @item --list-crls
@opindex list-crls @opindex list-crls

5
doc/gpg-agent.texi
View File

@ -171,9 +171,8 @@ shell, gpg-agent terminates within a few seconds.
@opindex supervised @opindex supervised
Run in the foreground, sending logs by default to stderr, and Run in the foreground, sending logs by default to stderr, and
listening on provided file descriptors, which must already be bound to listening on provided file descriptors, which must already be bound to
listening sockets. This command is useful when running under systemd listening sockets. This option is deprecated and not supported on
or other similar process supervision schemes. This option is not Windows.
supported on Windows.
In --supervised mode, different file descriptors can be provided for In --supervised mode, different file descriptors can be provided for
use as different socket types (e.g. ssh, extra) as long as they are use as different socket types (e.g. ssh, extra) as long as they are