summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-07-10 20:53:31 +1000
committerDamien Miller <djm@mindrot.org>2006-07-10 20:53:31 +1000
commit69996104fe4d5897e12eed9f6c7b6eacee0d2725 (patch)
treefc23dd19b71f34372e134f3dc47d9274e9b27567
parent9f2abc47ebd58c974f51718f31009b49a001c0d7 (diff)
- stevesk@cvs.openbsd.org 2006/07/06 16:22:39
[ssh-keygen.c] move #include "dns.h" up
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a4a75e57b..5b4cfc717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@
50 [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c] 50 [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c]
51 [uidswap.h] 51 [uidswap.h]
52 move #include <pwd.h> out of includes.h; ok markus@ 52 move #include <pwd.h> out of includes.h; ok markus@
53 - stevesk@cvs.openbsd.org 2006/07/06 16:22:39
54 [ssh-keygen.c]
55 move #include "dns.h" up
53 56
5420060706 5720060706
55 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 58 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4783,4 +4786,4 @@
4783 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4786 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4784 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4787 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4785 4788
4786$Id: ChangeLog,v 1.4371 2006/07/10 10:53:08 djm Exp $ 4789$Id: ChangeLog,v 1.4372 2006/07/10 10:53:31 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index b10e42ec8..aa2030ea7 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.145 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.146 2006/07/06 16:22:39 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
@@ -35,11 +35,11 @@
35#include "misc.h" 35#include "misc.h"
36#include "match.h" 36#include "match.h"
37#include "hostfile.h" 37#include "hostfile.h"
38#include "dns.h"
38 39
39#ifdef SMARTCARD 40#ifdef SMARTCARD
40#include "scard.h" 41#include "scard.h"
41#endif 42#endif
42#include "dns.h"
43 43
44/* Number of bits in the RSA/DSA key. This value can be set on the command line. */ 44/* Number of bits in the RSA/DSA key. This value can be set on the command line. */
45#define DEFAULT_BITS 2048 45#define DEFAULT_BITS 2048