summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-02-12 09:22:57 +1100
committerDamien Miller <djm@mindrot.org>2010-02-12 09:22:57 +1100
commit86cbb44d47c49b108b94854b02dd5c3eae19123d (patch)
treed6d9f4d7091353009045a557ad9893e314bf8268
parenta183c6edee2f5238e28607955e8ac95cef7f0d8c (diff)
- djm@cvs.openbsd.org 2010/02/09 00:50:59
[ssh-keygen.c] fix -Wall
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 506ea7dab..2ca5ec707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,9 @@
21 - djm@cvs.openbsd.org 2010/02/09 00:50:36 21 - djm@cvs.openbsd.org 2010/02/09 00:50:36
22 [ssh-agent.c] 22 [ssh-agent.c]
23 fallout from PKCS#11: unbreak -D 23 fallout from PKCS#11: unbreak -D
24 - djm@cvs.openbsd.org 2010/02/09 00:50:59
25 [ssh-keygen.c]
26 fix -Wall
24 27
2520100210 2820100210
26 - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for 29 - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 005f9c7ab..b6b7a2d9f 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.177 2010/02/08 10:50:20 markus Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.178 2010/02/09 00:50:59 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
@@ -460,7 +460,7 @@ do_print_public(struct passwd *pw)
460} 460}
461 461
462static void 462static void
463do_download(struct passwd *pw, const char *pkcs11provider) 463do_download(struct passwd *pw, char *pkcs11provider)
464{ 464{
465#ifdef ENABLE_PKCS11 465#ifdef ENABLE_PKCS11
466 Key **keys = NULL; 466 Key **keys = NULL;