diff options
author | Werner Koch <[email protected]> | 2014-11-28 08:44:19 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2014-11-28 08:44:19 +0000 |
commit | 7aee3579be6e24a1aa280e75615fc3a11ceef960 (patch) | |
tree | f8ae9f5c3cf5b30d7bfa6d31e37417d9c823996b /doc | |
parent | gpg-agent: Add restricted connection feature. (diff) | |
download | gnupg-7aee3579be6e24a1aa280e75615fc3a11ceef960.tar.gz gnupg-7aee3579be6e24a1aa280e75615fc3a11ceef960.zip |
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 <[email protected]>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/gpg.texi | 8 | ||||
-rw-r--r-- | doc/gpgsm.texi | 8 | ||||
-rw-r--r-- | doc/tools.texi | 5 |
3 files changed, 21 insertions, 0 deletions
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 |