upstream commit

don't try to load .ssh/identity by default if SSH1 is
 disabled; ok markus@

diff --git a/ssh-add.c b/ssh-add.c
index 37e4cc580509e2ca66357e78558b9bdb7eb1b541..9c8da5437e3c93705014d7a0163b07cead97d127 100644 (file)
--- a/ssh-add.c
+++ b/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
@@ -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
 };