Only display comment for ssh-askpass

This commit is contained in:
Damien Miller 1999-11-22 18:11:23 +11:00
parent 755c90c34c
commit d733c91bf3
2 changed files with 4 additions and 2 deletions

View File

@ -14,6 +14,8 @@
- Retry /dev/urandom reads interrupted by signal (report from - Retry /dev/urandom reads interrupted by signal (report from
Robert Hardy <rhardy@webcon.net>) Robert Hardy <rhardy@webcon.net>)
- Added a setenv replacement for systems which lack it - Added a setenv replacement for systems which lack it
- Only display public key comment when presenting ssh-askpass dialog
- Released 1.2pre14
19991121 19991121
- OpenBSD CVS Changes: - OpenBSD CVS Changes:

View File

@ -14,7 +14,7 @@ Adds an identity to the authentication server, or removes an identity.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$Id: ssh-add.c,v 1.10 1999/11/17 06:29:08 damien Exp $"); RCSID("$Id: ssh-add.c,v 1.11 1999/11/22 07:11:23 damien Exp $");
#include "rsa.h" #include "rsa.h"
#include "ssh.h" #include "ssh.h"
@ -282,7 +282,7 @@ int askpass(const char *filename, RSA *key, const char *saved_comment, char **co
exit(1); exit(1);
} }
tmp = snprintf(buf, sizeof(buf), "Need passphrase for %s (%s)", filename, saved_comment); tmp = snprintf(buf, sizeof(buf), "Need passphrase for %s", saved_comment);
/* skip the prompt if it won't fit */ /* skip the prompt if it won't fit */
if ((tmp < 0) || (tmp >= sizeof(buf))) if ((tmp < 0) || (tmp >= sizeof(buf)))
tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", 0); tmp = execlp(ASKPASS_PROGRAM, "ssh-askpass", 0);