- OpenBSD CVS Sync

- djm@cvs.openbsd.org 2010/07/16 04:45:30
     [ssh-keygen.c]
     avoid bogus compiler warning
This commit is contained in:
Damien Miller 2010-08-03 16:03:29 +10:00
parent 8b7a055e9a
commit 844cccfc1a
2 changed files with 6 additions and 2 deletions

View File

@ -2,6 +2,10 @@
- (dtucker) [monitor.c] Bug #1795: Initialize the values to be returned from
PAM to sane values in case the PAM method doesn't write to them. Spotted by
Bitman Zhou, ok djm@.
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/07/16 04:45:30
[ssh-keygen.c]
avoid bogus compiler warning
20100819
- (dtucker) [contrib/ssh-copy-ud.1] Bug #1786: update ssh-copy-id.1 with more

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.194 2010/06/30 07:26:03 jmc Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.195 2010/07/16 04:45:30 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -580,7 +580,7 @@ static void
do_convert_from(struct passwd *pw)
{
Key *k = NULL;
int private = 0, ok;
int private = 0, ok = 0;
struct stat st;
if (!have_identity)