diff options
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 { |