diff options
| author |   markus <markus@openbsd.org> | 2016-05-04 14:29:58 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2016-05-04 14:29:58 +0000 |
| commit | 94472eef4e2c8d939e51b91bb93d6169d2661baf (patch) | |
| tree | a838888a6859b444a4ce544b3ce818952a499f11 /usr.bin/ssh/ssh.c | |
| parent | move SSH_MSG_NONE, so we don't have to include ssh1.h; ok deraadt@ (diff) | |
| download | wireguard-openbsd-94472eef4e2c8d939e51b91bb93d6169d2661baf.tar.xz wireguard-openbsd-94472eef4e2c8d939e51b91bb93d6169d2661baf.zip | |
allow setting IdentityAgent to SSH_AUTH_SOCK; ok djm@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 { |