From 7aee3579be6e24a1aa280e75615fc3a11ceef960 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 28 Nov 2014 09:44:19 +0100 Subject: Add option --no-autostart. * g10/gpg.c: Add option --no-autostart. * sm/gpgsm.c: Ditto. * g10/options.h (opt): Add field autostart. * sm/gpgsm.h (opt): Ditto. * g10/call-agent.c (start_agent): Print note if agent was not autostarted. * sm/call-agent.c (start_agent): Ditto. * g10/call-dirmngr.c (create_context): Likewise. * sm/call-dirmngr.c (start_dirmngr_ext): Ditto. Signed-off-by: Werner Koch --- doc/gpg.texi | 8 ++++++++ doc/gpgsm.texi | 8 ++++++++ doc/tools.texi | 5 +++++ 3 files changed, 21 insertions(+) (limited to 'doc') diff --git a/doc/gpg.texi b/doc/gpg.texi index 634b4e26b..71ffaf8a8 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -1735,6 +1735,14 @@ fallback when the environment variable @code{DIRMNGR_INFO} is not set or a running dirmngr cannot be connected. @end ifset +@item --no-autostart +@opindex no-autostart +Do not start the gpg-agent or the dirmngr if it has not yet been +started and its service is required. This option is mostly useful on +machines where the connection to gpg-agent has been redirected to +another machines. If dirmngr is required on the remote machine, it +may be started manually using @command{gpgconf --launch dirmngr}. + @item --lock-once @opindex lock-once Lock the databases the first time a lock is requested diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi index 2ddedcd80..dcfe29295 100644 --- a/doc/gpgsm.texi +++ b/doc/gpgsm.texi @@ -384,6 +384,14 @@ always used. @item --disable-dirmngr Entirely disable the use of the Dirmngr. +@item --no-autostart +@opindex no-autostart +Do not start the gpg-agent or the dirmngr if it has not yet been +started and its service is required. This option is mostly useful on +machines where the connection to gpg-agent has been redirected to +another machines. If dirmngr is required on the remote machine, it +may be started manually using @command{gpgconf --launch dirmngr}. + @item --no-secmem-warning @opindex no-secmem-warning Do not print a warning when the so called "secure memory" cannot be used. diff --git a/doc/tools.texi b/doc/tools.texi index d556b6da4..0de214b60 100644 --- a/doc/tools.texi +++ b/doc/tools.texi @@ -1241,6 +1241,11 @@ When using @option{-S} or @option{--exec}, @command{gpg-connect-agent} connects to the assuan server in extended mode to allow descriptor passing. This option makes it use the old mode. +@item --no-autostart +@opindex no-autostart +Do not start the gpg-agent or the dirmngr if it has not yet been +started. + @item --run @var{file} @opindex run Run the commands from @var{file} at startup and then continue with the -- cgit v1.2.3