summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaddy@openbsd.org <naddy@openbsd.org>2015-03-26 12:32:38 +0000
committerDamien Miller <djm@mindrot.org>2015-03-27 12:02:34 +1100
commit1b0ef3813244c78669e6d4d54c624f600945327d (patch)
tree0e5600eeb5cef391b4c9a99a203fe07cb171b721
parentf9b78852379b74a2d14e6fc94fe52af30b7e9c31 (diff)
upstream commit
don't try to load .ssh/identity by default if SSH1 is disabled; ok markus@
-rw-r--r--ssh-add.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ssh-add.c b/ssh-add.c
index 37e4cc580..9c8da5437 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.121 2015/03/25 19:29:58 markus Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.122 2015/03/26 12:32:38 naddy 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
@@ -79,7 +79,9 @@ static char *default_files[] = {
79#endif 79#endif
80#endif /* WITH_OPENSSL */ 80#endif /* WITH_OPENSSL */
81 _PATH_SSH_CLIENT_ID_ED25519, 81 _PATH_SSH_CLIENT_ID_ED25519,
82#ifdef WITH_SSH1
82 _PATH_SSH_CLIENT_IDENTITY, 83 _PATH_SSH_CLIENT_IDENTITY,
84#endif
83 NULL 85 NULL
84}; 86};
85 87