summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-add.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index aad1cd29b..a00b680f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 - jmc@cvs.openbsd.org 2010/02/26 22:09:28 4 - jmc@cvs.openbsd.org 2010/02/26 22:09:28
5 [ssh-keygen.1 ssh.1 sshd.8] 5 [ssh-keygen.1 ssh.1 sshd.8]
6 tweak previous; 6 tweak previous;
7 - otto@cvs.openbsd.org 2010/03/01 11:07:06
8 [ssh-add.c]
9 zap what seems to be a left-over debug message; ok markus@
7 10
820100302 1120100302
9 - (tim) [config.guess config.sub] Bug 1722: Update to latest versions from 12 - (tim) [config.guess config.sub] Bug 1722: Update to latest versions from
diff --git a/ssh-add.c b/ssh-add.c
index a7963223a..ad9f7a83e 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-add.c,v 1.93 2010/02/26 20:29:54 djm Exp $ */ 1/* $OpenBSD: ssh-add.c,v 1.94 2010/03/01 11:07:06 otto 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
@@ -223,8 +223,7 @@ add_file(AuthenticationConnection *ac, const char *filename)
223 error("Certificate %s (%s) add failed", certpath, 223 error("Certificate %s (%s) add failed", certpath,
224 private->cert->key_id); 224 private->cert->key_id);
225 } 225 }
226 } else 226 }
227 fprintf(stderr, "Unable to load certificate %s", certpath);
228 227
229 xfree(certpath); 228 xfree(certpath);
230 xfree(comment); 229 xfree(comment);