From b7f827ae4586f6637bcad36b65ebafb51e727f36 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 1 Dec 2010 12:02:35 +1100 Subject: - djm@cvs.openbsd.org 2010/11/24 01:24:14 [channels.c] remove a debug() that pollutes stderr on client connecting to a server in debug mode (channel_close_fds is called transitively from the session code post-fork); bz#1719, ok dtucker --- ChangeLog | 5 +++++ channels.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39d88701a..25506a077 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,11 @@ [clientloop.c] avoid NULL deref on receiving a channel request on an unknown or invalid channel; report bz#1842 from jchadima AT redhat.com; ok dtucker@ + - djm@cvs.openbsd.org 2010/11/24 01:24:14 + [channels.c] + remove a debug() that pollutes stderr on client connecting to a server + in debug mode (channel_close_fds is called transitively from the session + code post-fork); bz#1719, ok dtucker 20101124 - (dtucker) [platform.c session.c] Move the getluid call out of session.c and diff --git a/channels.c b/channels.c index 1cd5004c4..6abe2d012 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.309 2010/08/05 13:08:42 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.310 2010/11/24 01:24:14 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -373,9 +373,6 @@ channel_close_fd(int *fdp) static void channel_close_fds(Channel *c) { - debug3("channel %d: close_fds r %d w %d e %d", - c->self, c->rfd, c->wfd, c->efd); - channel_close_fd(&c->sock); channel_close_fd(&c->rfd); channel_close_fd(&c->wfd); -- cgit v1.2.3