summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2015-03-04 21:12:59 +0000
committerDamien Miller <djm@mindrot.org>2015-03-05 10:27:22 +1100
commit2f04af92f036b0c87a23efb259c37da98cd81fe6 (patch)
treebf5b71433e631657a7f65b17758626972c18f063
parenta05adf95d2af6abb2b7826ddaa7a0ec0cdc1726b (diff)
upstream commit
make ssh-add -D work with !SSH1 agent
-rw-r--r--ssh-agent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ssh-agent.c b/ssh-agent.c
index 49241052..aeda656a 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.198 2015/03/03 21:21:13 djm Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.199 2015/03/04 21:12:59 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -866,10 +866,10 @@ process_message(SocketEntry *e)
case SSH_AGENTC_REMOVE_RSA_IDENTITY:
process_remove_identity(e, 1);
break;
+#endif
case SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES:
- process_remove_all_identities(e, 1);
+ process_remove_all_identities(e, 1); /* safe for !WITH_SSH1 */
break;
-#endif
/* ssh2 */
case SSH2_AGENTC_SIGN_REQUEST:
process_sign_request2(e);