summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-08-03 16:03:29 +1000
committerDamien Miller <djm@mindrot.org>2010-08-03 16:03:29 +1000
commit844cccfc1ae3bde48aa481bb8522d482fc8e7a0e (patch)
treec2bdf4dad44f9a19240e30d8a49bdf7f6c2f7b02
parent8b7a055e9aac7c95d934e4ad8ba3991dfccfe586 (diff)
- OpenBSD CVS Sync
- djm@cvs.openbsd.org 2010/07/16 04:45:30 [ssh-keygen.c] avoid bogus compiler warning
-rw-r--r--ChangeLog4
-rw-r--r--ssh-keygen.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fd2e2c06..4421f35b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 48209380..56bfee20 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -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)