summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-15 11:12:38 +1100
committerDamien Miller <djm@mindrot.org>2006-03-15 11:12:38 +1100
commitde6dd0a35f9eb100d02a8953800ae49cc27e9cd5 (patch)
treeb945f6352e24b6876e565cbdd40878e521d5aee4
parent5d7710552751dc58667e5cc73434846395de2480 (diff)
- stevesk@cvs.openbsd.org 2006/02/07 03:59:20
[deattack.c] duplicate #include
-rw-r--r--ChangeLog5
-rw-r--r--deattack.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b9c0bd8e..4b2a7658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
- stevesk@cvs.openbsd.org 2006/02/07 03:47:05
[hostfile.c]
"packet.h" not needed
+ - stevesk@cvs.openbsd.org 2006/02/07 03:59:20
+ [deattack.c]
+ duplicate #include
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3924,4 +3927,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4146 2006/03/15 00:12:13 djm Exp $
+$Id: ChangeLog,v 1.4147 2006/03/15 00:12:38 djm Exp $
diff --git a/deattack.c b/deattack.c
index 8b55d668..0cf1e1c5 100644
--- a/deattack.c
+++ b/deattack.c
@@ -18,14 +18,13 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: deattack.c,v 1.19 2003/09/18 08:49:45 markus Exp $");
+RCSID("$OpenBSD: deattack.c,v 1.20 2006/02/07 03:59:20 stevesk Exp $");
#include "deattack.h"
#include "log.h"
#include "crc32.h"
#include "getput.h"
#include "xmalloc.h"
-#include "deattack.h"
/* SSH Constants */
#define SSH_MAXBLOCKS (32 * 1024)