X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/ccc6beeadd1414d68a9c44514fc14e3a9f944a3e..f8f89bae5e11c9c8e1895f0b62b0bdf80a5539fc:/ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6a2c5201..adacbff0 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.164 2008/01/19 22:22:58 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.165 2008/01/19 22:37:19 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -504,7 +504,7 @@ do_fingerprint(struct passwd *pw)
 	FILE *f;
 	Key *public;
 	char *comment = NULL, *cp, *ep, line[16*1024], *fp;
-	int i, skip = 0, num = 1, invalid = 1;
+	int i, skip = 0, num = 0, invalid = 1;
 	enum fp_rep rep;
 	enum fp_type fptype;
 	struct stat st;
@@ -536,7 +536,8 @@ do_fingerprint(struct passwd *pw)
 	if (f != NULL) {
 		while (fgets(line, sizeof(line), f)) {
 			if ((cp = strchr(line, '\n')) == NULL) {
-				error("line %d too long: %.40s...", num, line);
+				error("line %d too long: %.40s...",
+				    num + 1, line);
 				skip = 1;
 				continue;
 			}
@@ -613,7 +614,7 @@ do_known_hosts(struct passwd *pw, const char *name)
 	Key *public;
 	char *cp, *cp2, *kp, *kp2;
 	char line[16*1024], tmp[MAXPATHLEN], old[MAXPATHLEN];
-	int c, skip = 0, inplace = 0, num = 1, invalid = 0, has_unhashed = 0;
+	int c, skip = 0, inplace = 0, num = 0, invalid = 0, has_unhashed = 0;
 
 	if (!have_identity) {
 		cp = tilde_expand_filename(_PATH_SSH_USER_HOSTFILE, pw->pw_uid);
@@ -649,7 +650,7 @@ do_known_hosts(struct passwd *pw, const char *name)
 
 	while (fgets(line, sizeof(line), in)) {
 		if ((cp = strchr(line, '\n')) == NULL) {
-			error("line %d too long: %.40s...", num, line);
+			error("line %d too long: %.40s...", num + 1, line);
 			skip = 1;
 			invalid = 1;
 			continue;
@@ -748,7 +749,7 @@ do_known_hosts(struct passwd *pw, const char *name)
 	fclose(in);
 
 	if (invalid) {
-		fprintf(stderr, "%s is not a valid known_host file.\n",
+		fprintf(stderr, "%s is not a valid known_hosts file.\n",
 		    identity_file);
 		if (inplace) {
 			fprintf(stderr, "Not replacing existing known_hosts "