From 1c11cdbc93b2abd81e62b2f6e74d23db0566824f Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Thu, 26 Mar 2015 12:32:38 +0000
Subject: don't try to load .ssh/identity by default if SSH1 is disabled; ok
 markus@

---
 usr.bin/ssh/ssh-add.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'usr.bin/ssh/ssh-add.c')

diff --git a/usr.bin/ssh/ssh-add.c b/usr.bin/ssh/ssh-add.c
index 04810ff6156..b2677666312 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.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
@@ -71,7 +71,9 @@ 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
 };
 
-- 
cgit v1.2.3-59-g8ed1b