diff options
| author |   djm <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-04-30 23:10:43 +0000 |
| commit | 67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d (patch) | |
| tree | 8092cdbbddcde08ee62518f1db74e4b13c5be4f6 /usr.bin/ssh/ssh-add.c | |
| parent | Make early attrbute work here as well. Remove unreachable panic while there. (diff) | |
| download | wireguard-openbsd-67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d.tar.xz wireguard-openbsd-67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d.zip | |
unifdef WITH_SSH1
ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
| -rw-r--r-- | usr.bin/ssh/ssh-add.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c index c64f8d56edc..e72d8ae2865 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.128 2016/02/15 09:47:49 dtucker Exp $ */ +/* $OpenBSD: ssh-add.c,v 1.129 2017/04/30 23:10:43 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -71,9 +71,6 @@ 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 }; @@ -355,11 +352,7 @@ list_identities(int agent_fd, int do_fp) int r, had_identities = 0; struct ssh_identitylist *idlist; size_t i; -#ifdef WITH_SSH1 - int version = 1; -#else int version = 2; -#endif for (; version <= 2; version++) { if ((r = ssh_fetch_identitylist(agent_fd, version, |