===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.63.2.1
retrieving revision 1.63.2.2
diff -u -r1.63.2.1 -r1.63.2.2
--- src/usr.bin/ssh/ssh-add.c	2003/04/01 00:12:14	1.63.2.1
+++ src/usr.bin/ssh/ssh-add.c	2003/09/16 21:20:27	1.63.2.2
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.63.2.1 2003/04/01 00:12:14 margarida Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.63.2.2 2003/09/16 21:20:27 brad Exp $");
 
 #include <openssl/evp.h>
 
@@ -158,7 +158,8 @@
 			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);
 		}
 	}
 
@@ -195,7 +196,7 @@
 	if (pin == NULL)
 		return -1;
 
-	if (ssh_update_card(ac, add, id, pin)) {
+	if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) {
 		fprintf(stderr, "Card %s: %s\n",
 		    add ? "added" : "removed", id);
 		ret = 0;