- markus@cvs.openbsd.org 2003/06/16 10:22:45

     [ssh-add.c]
     print out key comment on each prompt; make ssh-askpass more useable; ok djm@

diff --git a/ChangeLog b/ChangeLog
index 0d7523f407a4f1b9955f132348da31235cc34b92..5c376d1f836cf28eb519e6ad541d5ed3b47011bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
      make sure the signature has at least the expected length (don't
      insist on len == hlen + oidlen, since this breaks some smartcards)
      bugzilla #592; ok djm@
+   - markus@cvs.openbsd.org 2003/06/16 10:22:45
+     [ssh-add.c]
+     print out key comment on each prompt; make ssh-askpass more useable; ok djm@
 
 20030614
  - (djm) Update license on fake-rfc2553.[ch]; ok itojun@

diff --git a/ssh-add.c b/ssh-add.c
index 9d14a3649d20f94f96330450ae3763ff6cf76ff7..5b0fbbce6c0f4d9bd8db498dfc27859b52584dbc 100644 (file)
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.67 2003/06/11 11:18:38 djm Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.68 2003/06/16 10:22:45 markus Exp $");
 
 #include <openssl/evp.h>
 
@@ -164,7 +164,8 @@ add_file(AuthenticationConnection *ac, const char *filename)
                        if (private != NULL)
                                break;
                        clear_pass();
-                       strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
+                       snprintf(msg, sizeof msg,
+                           "Bad passphrase, try again for %.200s: ", comment);
                }
        }