===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-add.c,v
retrieving revision 1.66.2.2
retrieving revision 1.67
diff -u -r1.66.2.2 -r1.67
--- src/usr.bin/ssh/ssh-add.c	2004/03/04 18:18:16	1.66.2.2
+++ src/usr.bin/ssh/ssh-add.c	2003/06/11 11:18:38	1.67
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-add.c,v 1.66.2.2 2004/03/04 18:18:16 brad Exp $");
+RCSID("$OpenBSD: ssh-add.c,v 1.67 2003/06/11 11:18:38 djm Exp $");
 
 #include <openssl/evp.h>
 
@@ -158,19 +158,18 @@
 			if (private != NULL)
 				break;
 			clear_pass();
-			snprintf(msg, sizeof msg,
-			    "Bad passphrase, try again for %.200s: ", comment);
+			strlcpy(msg, "Bad passphrase, try again: ", sizeof msg);
 		}
 	}
 
-	if (ssh_add_identity_constrained(ac, private, comment, lifetime,
-	    confirm)) {
+ 	if (ssh_add_identity_constrained(ac, private, comment, lifetime,
+ 	    confirm)) {
 		fprintf(stderr, "Identity added: %s (%s)\n", filename, comment);
 		ret = 0;
 		if (lifetime != 0)
 			fprintf(stderr,
 			    "Lifetime set to %d seconds\n", lifetime);
-		if (confirm != 0)
+ 		if (confirm != 0)
 			fprintf(stderr,
 			    "The user has to confirm each use of the key\n");
 	} else if (ssh_add_identity(ac, private, comment)) {