diff options
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/readconf.c | 3 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh_config.5 | 7 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd_config.5 | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 7e05e8c49f8..b9cb3884e9e 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.c,v 1.253 2016/05/04 12:21:53 markus Exp $ */ +/* $OpenBSD: readconf.c,v 1.254 2016/05/04 14:29:58 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2017,6 +2017,7 @@ fill_default_options(Options * options) CLEAR_ON_NONE(options->proxy_command); CLEAR_ON_NONE(options->control_path); CLEAR_ON_NONE(options->revoked_host_keys); + /* options->identity_agent distinguishes NULL from 'none' */ /* options->user will be set in the main program if appropriate */ /* options->hostname will be set in the main program if appropriate */ /* options->host_key_alias should not be set by default */ diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index e31857f49da..adb88e9d455 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.439 2016/05/04 12:21:53 markus Exp $ */ +/* $OpenBSD: ssh.c,v 1.440 2016/05/04 14:29:58 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1287,7 +1287,8 @@ main(int ac, char **av) load_public_identity_files(); /* optionally set the SSH_AUTHSOCKET_ENV_NAME varibale */ - if (options.identity_agent) { + if (options.identity_agent && + strcmp(options.identity_agent, SSH_AUTHSOCKET_ENV_NAME) != 0) { if (strcmp(options.identity_agent, "none") == 0) { unsetenv(SSH_AUTHSOCKET_ENV_NAME); } else { diff --git a/usr.bin/ssh/ssh_config.5 b/usr.bin/ssh/ssh_config.5 index be790114a4c..45fe892023a 100644 --- a/usr.bin/ssh/ssh_config.5 +++ b/usr.bin/ssh/ssh_config.5 @@ -33,7 +33,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.231 2016/05/04 12:21:53 markus Exp $ +.\" $OpenBSD: ssh_config.5,v 1.232 2016/05/04 14:29:58 markus Exp $ .Dd $Mdocdate: May 4 2016 $ .Dt SSH_CONFIG 5 .Os @@ -963,6 +963,11 @@ environment variable and can be used to select a specific agent. Setting the socket name to .Dq none disables the use of an authentication agent. +If the string +.Dq SSH_AUTH_SOCK +is specified, the location of the socket will be read from the +.Ev SSH_AUTH_SOCK +environment variable. .Pp The socket name may use the tilde syntax to refer to a user's home directory or one of the following diff --git a/usr.bin/ssh/sshd_config.5 b/usr.bin/ssh/sshd_config.5 index 85a5621aadb..47b658e58e1 100644 --- a/usr.bin/ssh/sshd_config.5 +++ b/usr.bin/ssh/sshd_config.5 @@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd_config.5,v 1.222 2016/04/27 13:53:48 jmc Exp $ -.Dd $Mdocdate: April 27 2016 $ +.\" $OpenBSD: sshd_config.5,v 1.223 2016/05/04 14:29:58 markus Exp $ +.Dd $Mdocdate: May 4 2016 $ .Dt SSHD_CONFIG 5 .Os .Sh NAME @@ -739,7 +739,7 @@ to an .It Cm HostKeyAgent Identifies the UNIX-domain socket used to communicate with an agent that has access to the private host keys. -If +If the string .Dq SSH_AUTH_SOCK is specified, the location of the socket will be read from the .Ev SSH_AUTH_SOCK |