summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/ssh-add.c
diff options
context:
space:
mode:
authorpascal <pascal@openbsd.org>2013-12-15 18:17:26 +0000
committerpascal <pascal@openbsd.org>2013-12-15 18:17:26 +0000
commitabb2e7be24cf959dd6e47ba5f7b9313d9717c02d (patch)
tree7c5dc0fe3f2105fe5c6a019eb13239cf72bb6aea /usr.bin/ssh/ssh-add.c
parentremove popa3d etc tendrils (diff)
downloadwireguard-openbsd-abb2e7be24cf959dd6e47ba5f7b9313d9717c02d.tar.xz
wireguard-openbsd-abb2e7be24cf959dd6e47ba5f7b9313d9717c02d.zip
Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page.
ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-add.c')
-rw-r--r--usr.bin/ssh/ssh-add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index 149a9768f55..fdbc052bd38 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.106 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.107 2013/12/15 18:17:26 pascal Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -67,6 +67,7 @@ static char *default_files[] = {
_PATH_SSH_CLIENT_ID_RSA,
_PATH_SSH_CLIENT_ID_DSA,
_PATH_SSH_CLIENT_ID_ECDSA,
+ _PATH_SSH_CLIENT_ID_ED25519,
_PATH_SSH_CLIENT_IDENTITY,
NULL
};