diff options
author | markus@openbsd.org <markus@openbsd.org> | 2016-05-04 14:29:58 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-05-19 17:48:35 +1000 |
commit | 1a75d14daf4b60db903e6103cf50e74e0cd0a76b (patch) | |
tree | c6b0bc7d927ee6d75290401ca7302400d4290f12 /ssh.c | |
parent | 0516454151ae722fc8256c3c56115c6baf24c5b0 (diff) |
upstream commit
allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
Upstream-ID: 20c508480d8db3eef18942c0fc39b1fcf25652ac
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.439 2016/05/04 12:21:53 markus Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.440 2016/05/04 14:29:58 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1336,7 +1336,8 @@ main(int ac, char **av) | |||
1336 | load_public_identity_files(); | 1336 | load_public_identity_files(); |
1337 | 1337 | ||
1338 | /* optionally set the SSH_AUTHSOCKET_ENV_NAME varibale */ | 1338 | /* optionally set the SSH_AUTHSOCKET_ENV_NAME varibale */ |
1339 | if (options.identity_agent) { | 1339 | if (options.identity_agent && |
1340 | strcmp(options.identity_agent, SSH_AUTHSOCKET_ENV_NAME) != 0) { | ||
1340 | if (strcmp(options.identity_agent, "none") == 0) { | 1341 | if (strcmp(options.identity_agent, "none") == 0) { |
1341 | unsetenv(SSH_AUTHSOCKET_ENV_NAME); | 1342 | unsetenv(SSH_AUTHSOCKET_ENV_NAME); |
1342 | } else { | 1343 | } else { |