diff options
| author |   naddy <naddy@openbsd.org> | 2015-03-26 12:32:38 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2015-03-26 12:32:38 +0000 |
| commit | 1c11cdbc93b2abd81e62b2f6e74d23db0566824f (patch) | |
| tree | 966f1fb1af95ab297bb91b16208edeb6f3c1a5d7 /usr.bin/ssh/ssh-add.c | |
| parent | Remove bits of unfinished IPsec proxy support. DNS' KX records, anyone? (diff) | |
| download | wireguard-openbsd-1c11cdbc93b2abd81e62b2f6e74d23db0566824f.tar.xz wireguard-openbsd-1c11cdbc93b2abd81e62b2f6e74d23db0566824f.zip | |
don't try to load .ssh/identity by default if SSH1 is disabled; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
| -rw-r--r-- | usr.bin/ssh/ssh-add.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index 04810ff6156..b2677666312 100644 --- a/usr.bin/ssh/ssh-add.c +++ b/usr.bin/ssh/ssh-add.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-add.c,v 1.121 2015/03/25 19:29:58 markus Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.122 2015/03/26 12:32:38 naddy Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -71,7 +71,9 @@ static char *default_files[] = { _PATH_SSH_CLIENT_ID_DSA, _PATH_SSH_CLIENT_ID_ECDSA, _PATH_SSH_CLIENT_ID_ED25519, +#ifdef WITH_SSH1 _PATH_SSH_CLIENT_IDENTITY, +#endif NULL }; |