diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -4,6 +4,9 @@ | |||
4 | [servconf.c] | 4 | [servconf.c] |
5 | passord -> password; | 5 | passord -> password; |
6 | fixes user/5975 from Rene Maroufi | 6 | fixes user/5975 from Rene Maroufi |
7 | - stevesk@cvs.openbsd.org 2008/11/07 00:42:12 | ||
8 | [ssh-keygen.c] | ||
9 | spelling/typo in comment | ||
7 | 10 | ||
8 | 20081105 | 11 | 20081105 |
9 | - OpenBSD CVS Sync | 12 | - OpenBSD CVS Sync |
@@ -4896,4 +4899,4 @@ | |||
4896 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 4899 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
4897 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 4900 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
4898 | 4901 | ||
4899 | $Id: ChangeLog,v 1.5133 2008/11/11 05:31:05 dtucker Exp $ | 4902 | $Id: ChangeLog,v 1.5134 2008/11/11 05:31:43 dtucker Exp $ |
diff --git a/ssh-keygen.c b/ssh-keygen.c index f7e284062..a45499177 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.171 2008/07/13 21:22:52 sthen Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.172 2008/11/07 00:42:12 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1426,7 +1426,7 @@ passphrase_again: | |||
1426 | if (identity_comment) { | 1426 | if (identity_comment) { |
1427 | strlcpy(comment, identity_comment, sizeof(comment)); | 1427 | strlcpy(comment, identity_comment, sizeof(comment)); |
1428 | } else { | 1428 | } else { |
1429 | /* Create default commend field for the passphrase. */ | 1429 | /* Create default comment field for the passphrase. */ |
1430 | snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, hostname); | 1430 | snprintf(comment, sizeof comment, "%s@%s", pw->pw_name, hostname); |
1431 | } | 1431 | } |
1432 | 1432 | ||