aboutsummaryrefslogtreecommitdiffstats
path: root/doc/gpg-agent.texi
diff options
context:
space:
mode:
authorJustus Winter <[email protected]>2016-09-15 12:47:00 +0000
committerJustus Winter <[email protected]>2016-09-30 10:06:02 +0000
commite11686f973b35869d7b299ce4726003ac22e2e3a (patch)
treec47ff021acf9e1ac03ff890c9540530343db5b36 /doc/gpg-agent.texi
parentw32: Fix STARTTLS on LDAP connections. (diff)
downloadgnupg-e11686f973b35869d7b299ce4726003ac22e2e3a.tar.gz
gnupg-e11686f973b35869d7b299ce4726003ac22e2e3a.zip
agent: Enable restricted, browser, and ssh socket by default.
* agent/gpg-agent.c (main): Provide defaults for 'extra-socket' and 'browser-socket', enable ssh socket by default, but do not emit the 'SSH_AUTH_SOCK' variable unless it has been explicitly requested. * configure.ac (GPG_AGENT_{EXTRA,BROWSER}_SOCK_NAME): New definitions. * doc/gpg-agent.texi: Update documentation. -- This change enables the restricted, browser, and ssh socket by default. Note that in all cases, the user has to do some additional configuration to her setup to make use of these features. Therefore, this should not break any existing setups, but makes it simpler to discover and use these features. Signed-off-by: Justus Winter <[email protected]>
Diffstat (limited to 'doc/gpg-agent.texi')
-rw-r--r--doc/gpg-agent.texi6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi
index 53a6f785e..8d86add74 100644
--- a/doc/gpg-agent.texi
+++ b/doc/gpg-agent.texi
@@ -537,6 +537,9 @@ pinentry to pop up at the @code{tty} or display you started the agent.
@anchor{option --extra-socket}
@item --extra-socket @var{name}
@opindex extra-socket
+The extra socket is always created, you may use this option to change
+the name of the socket.
+
Also listen on native gpg-agent connections on the given socket. The
intended use for this extra socket is to setup a Unix domain socket
forwarding from a remote machine to this socket on the local machine.
@@ -552,7 +555,8 @@ remote machine.
@opindex enable-ssh-support
@opindex enable-putty-support
-Enable the OpenSSH Agent protocol.
+The OpenSSH Agent protocol is always enabled, but @command{gpg-agent}
+will only set the @code{SSH_AUTH_SOCK} variable if this flag is given.
In this mode of operation, the agent does not only implement the
gpg-agent protocol, but also the agent protocol used by OpenSSH