diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-01-19 22:37:20 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-01-19 22:37:20 +0000 |
| commit | 65149479c42ea85f5616756d54048a1b55c4398d (patch) | |
| tree | 83f71170fd3e7226dc0931ae9334dfce28657f91 /usr.bin | |
| parent | 691e0091af0b29dfe5d342a696e2977dfe6d096c (diff) | |
unbreak line numbering (broken in revision 1.164), fix error message
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index df2a6a88476..bd5a262cd88 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/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 @@ -497,7 +497,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; @@ -529,7 +529,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; } @@ -606,7 +607,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); @@ -642,7 +643,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; @@ -741,7 +742,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 " |