diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -2,6 +2,10 @@ | |||
2 | - (dtucker) [monitor.c] Bug #1795: Initialize the values to be returned from | 2 | - (dtucker) [monitor.c] Bug #1795: Initialize the values to be returned from |
3 | PAM to sane values in case the PAM method doesn't write to them. Spotted by | 3 | PAM to sane values in case the PAM method doesn't write to them. Spotted by |
4 | Bitman Zhou, ok djm@. | 4 | Bitman Zhou, ok djm@. |
5 | - OpenBSD CVS Sync | ||
6 | - djm@cvs.openbsd.org 2010/07/16 04:45:30 | ||
7 | [ssh-keygen.c] | ||
8 | avoid bogus compiler warning | ||
5 | 9 | ||
6 | 20100819 | 10 | 20100819 |
7 | - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more | 11 | - (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 48209380c..56bfee20d 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keygen.c,v 1.194 2010/06/30 07:26:03 jmc Exp $ */ | 1 | /* $OpenBSD: ssh-keygen.c,v 1.195 2010/07/16 04:45:30 djm 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 |
@@ -580,7 +580,7 @@ static void | |||
580 | do_convert_from(struct passwd *pw) | 580 | do_convert_from(struct passwd *pw) |
581 | { | 581 | { |
582 | Key *k = NULL; | 582 | Key *k = NULL; |
583 | int private = 0, ok; | 583 | int private = 0, ok = 0; |
584 | struct stat st; | 584 | struct stat st; |
585 | 585 | ||
586 | if (!have_identity) | 586 | if (!have_identity) |