summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2014-04-20 13:24:01 +1000
committerDamien Miller <djm@mindrot.org>2014-04-20 13:24:01 +1000
commit2a328437fb1b0976f2f4522d8645803d5a5d0967 (patch)
treea8bf4ff28bc5953feab27c93eee6822e8ec2651d
parent7d6a9fb660c808882d064e152d6070ffc3844c3f (diff)
- djm@cvs.openbsd.org 2014/04/01 05:32:57
[packet.c] demote a debug3 to PACKET_DEBUG; ok markus@
-rw-r--r--ChangeLog3
-rw-r--r--packet.c6
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 898fc89c6..43b0c5f4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,9 @@
82 dialog by offering only certificate keys. 82 dialog by offering only certificate keys.
83 83
84 Reported by mcv21 AT cam.ac.uk 84 Reported by mcv21 AT cam.ac.uk
85 - djm@cvs.openbsd.org 2014/04/01 05:32:57
86 [packet.c]
87 demote a debug3 to PACKET_DEBUG; ok markus@
85 88
8620140401 8920140401
87 - (djm) On platforms that support it, use prctl() to prevent sftp-server 90 - (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/packet.c b/packet.c
index 54c0558f9..1275fca92 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.192 2014/02/02 03:44:31 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.193 2014/04/01 05:32:57 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
@@ -912,8 +912,8 @@ packet_send2_wrapped(void)
912 roundup(active_state->extra_pad, block_size); 912 roundup(active_state->extra_pad, block_size);
913 pad = active_state->extra_pad - 913 pad = active_state->extra_pad -
914 ((len + padlen) % active_state->extra_pad); 914 ((len + padlen) % active_state->extra_pad);
915 debug3("packet_send2: adding %d (len %d padlen %d extra_pad %d)", 915 DBG(debug3("%s: adding %d (len %d padlen %d extra_pad %d)",
916 pad, len, padlen, active_state->extra_pad); 916 __func__, pad, len, padlen, active_state->extra_pad));
917 padlen += pad; 917 padlen += pad;
918 active_state->extra_pad = 0; 918 active_state->extra_pad = 0;
919 } 919 }