summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--packet.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b71edf086..484d93a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 ssh-keygen.1 ssh-keyscan.1 ssh-add.1 sshd.8 ssh.1 ssh-keysign.8] 12 ssh-keygen.1 ssh-keyscan.1 ssh-add.1 sshd.8 ssh.1 ssh-keysign.8]
13 convert to new .Dd format; 13 convert to new .Dd format;
14 (We will need to teach mdoc2man.awk to understand this too.) 14 (We will need to teach mdoc2man.awk to understand this too.)
15 - djm@cvs.openbsd.org 2007/05/31 23:34:29
16 [packet.c]
17 gc unreachable code; spotted by Tavis Ormandy
15 18
1620070520 1920070520
17 - (dtucker) OpenBSD CVS Sync 20 - (dtucker) OpenBSD CVS Sync
@@ -2955,4 +2958,4 @@
2955 OpenServer 6 and add osr5bigcrypt support so when someone migrates 2958 OpenServer 6 and add osr5bigcrypt support so when someone migrates
2956 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 2959 passwords between UnixWare and OpenServer they will still work. OK dtucker@
2957 2960
2958$Id: ChangeLog,v 1.4673 2007/06/05 08:27:13 dtucker Exp $ 2961$Id: ChangeLog,v 1.4674 2007/06/05 08:28:20 dtucker Exp $
diff --git a/packet.c b/packet.c
index 7d8fab1e9..a2e9f5987 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.145 2006/09/19 21:14:08 markus Exp $ */ 1/* $OpenBSD: packet.c,v 1.146 2007/05/31 23:34:29 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1235,7 +1235,6 @@ packet_read_poll_seqnr(u_int32_t *seqnr_p)
1235 logit("Received disconnect from %s: %.400s", 1235 logit("Received disconnect from %s: %.400s",
1236 get_remote_ipaddr(), msg); 1236 get_remote_ipaddr(), msg);
1237 cleanup_exit(255); 1237 cleanup_exit(255);
1238 xfree(msg);
1239 break; 1238 break;
1240 default: 1239 default:
1241 if (type) 1240 if (type)