diff options
| author | naddy@openbsd.org <naddy@openbsd.org> | 2015-03-26 12:32:38 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-03-27 12:02:34 +1100 |
| commit | 1b0ef3813244c78669e6d4d54c624f600945327d (patch) | |
| tree | 0e5600eeb5cef391b4c9a99a203fe07cb171b721 /ssh-add.c | |
| parent | f9b78852379b74a2d14e6fc94fe52af30b7e9c31 (diff) | |
upstream commit
don't try to load .ssh/identity by default if SSH1 is
disabled; ok markus@
Diffstat (limited to 'ssh-add.c')
| -rw-r--r-- | ssh-add.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 @@ -79,7 +79,9 @@ static char *default_files[] = { #endif #endif /* WITH_OPENSSL */ _PATH_SSH_CLIENT_ID_ED25519, +#ifdef WITH_SSH1 _PATH_SSH_CLIENT_IDENTITY, +#endif NULL }; |