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

dirmngr: Do not implement --supervised in Windows. 

* dirmngr/dirmngr.c (opts) [W32]: Remove --supervised.
(main) [W32]: Ditto.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-10-27 09:27:03 +02:00
parent a9c8b5fbe7
commit cf20b23c14
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dirmngr/dirmngr.c
View File

@ -150,7 +150,9 @@ static ARGPARSE_OPTS 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)") ),
ARGPARSE_c (aSupervised, "supervised", N_("run under supervision (e.g. systemd)")), #ifndef HAVE_W32_SYSTEM
ARGPARSE_c (aSupervised, "supervised", N_("run in supervised mode")),
#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")),
ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")), ARGPARSE_c (aFetchCRL, "fetch-crl", N_("|URL|fetch a CRL from URL")),
@ -996,6 +998,7 @@ main (int argc, char **argv)
start_command_handler (ASSUAN_INVALID_FD); start_command_handler (ASSUAN_INVALID_FD);
shutdown_reaper (); shutdown_reaper ();
} }
#ifndef HAVE_W32_SYSTEM
else if (cmd == aSupervised) else if (cmd == aSupervised)
{ {
/* In supervised mode, we expect file descriptor 3 to be an /* In supervised mode, we expect file descriptor 3 to be an
@ -1004,9 +1007,9 @@ main (int argc, char **argv)
We will also not detach from the controlling process or close We will also not detach from the controlling process or close
stderr; the supervisor should handle all of that. */ stderr; the supervisor should handle all of that. */
struct stat statbuf; struct stat statbuf;
if (fstat (3, &statbuf) == -1 && errno ==EBADF) if (fstat (3, &statbuf) == -1 && errno == EBADF)
{ {
log_error ("file descriptor 3 must be already open in --supervised mode\n"); log_error ("file descriptor 3 must be validin --supervised mode\n");
dirmngr_exit (1); dirmngr_exit (1);
} }
socket_name = gnupg_get_socket_name (3); socket_name = gnupg_get_socket_name (3);
@ -1033,6 +1036,7 @@ main (int argc, char **argv)
assuan_sock_close (3); assuan_sock_close (3);
shutdown_reaper (); shutdown_reaper ();
} }
#endif /*HAVE_W32_SYSTEM*/
else if (cmd == aDaemon) else if (cmd == aDaemon)
{ {
assuan_fd_t fd; assuan_fd_t fd;

2
doc/dirmngr.texi
View File

@ -90,7 +90,7 @@ internal certificate validation code. This mode is deprecated.
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 is useful when running under systemd or other similar process
supervision schemes. supervision schemes. This option is not supported on Windows.
@item --list-crls @item --list-crls
@opindex list-crls @opindex list-crls