summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>1999-11-22 18:11:23 +1100
committerDamien Miller <djm@mindrot.org>1999-11-22 18:11:23 +1100
commitd733c91bf3e66c4b14228b3dc20ed448a3bc6d7c (patch)
tree3958f6ecb89f5e6bd663aa7360411a6b36895657
parent755c90c34c3bebd08c72a187bbcd8235a4939a6d (diff)
Only display comment for ssh-askpass
-rw-r--r--ChangeLog2
-rw-r--r--ssh-add.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f069dfd1..04561846e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
14 - Retry /dev/urandom reads interrupted by signal (report from 14 - Retry /dev/urandom reads interrupted by signal (report from
15 Robert Hardy <rhardy@webcon.net>) 15 Robert Hardy <rhardy@webcon.net>)
16 - Added a setenv replacement for systems which lack it 16 - Added a setenv replacement for systems which lack it
17 - Only display public key comment when presenting ssh-askpass dialog
18 - Released 1.2pre14
17 19
1819991121 2019991121
19 - OpenBSD CVS Changes: 21 - OpenBSD CVS Changes:
diff --git a/ssh-add.c b/ssh-add.c
index cdd5ca1d0..ba8a964b0 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -14,7 +14,7 @@ Adds an identity to the authentication server, or removes an identity.
14*/ 14*/
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$Id: ssh-add.c,v 1.10 1999/11/17 06:29:08 damien Exp $"); 17RCSID("$Id: ssh-add.c,v 1.11 1999/11/22 07:11:23 damien Exp $");
18 18
19#include "rsa.h" 19#include "rsa.h"
20#include "ssh.h" 20#include "ssh.h"
@@ -282,7 +282,7 @@ int askpass(const char *filename, RSA *key, const char *saved_comment, char **co
282 exit(1); 282 exit(1);
283 } 283 }
284 284
285 tmp = snprintf(buf, sizeof(buf), "Need passphrase for %s (%s)", filename, saved_comment); 285 tmp = snprintf(buf, sizeof(buf), "Need passphrase for %s", saved_comment);
286 /* skip the prompt if it won't fit */ 286 /* skip the prompt if it won't fit */
287 if ((tmp < 0) || (tmp >= sizeof(buf))) 287 if ((tmp < 0) || (tmp >= sizeof(buf)))
288 tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", 0); 288 tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", 0);