summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--channels.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f0ffd3fac..374099790 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,9 @@
69 [channels.c channels.h nchan.c] 69 [channels.c channels.h nchan.c]
70 undo broken channel fix and try a different one. there 70 undo broken channel fix and try a different one. there
71 should be still some select errors... 71 should be still some select errors...
72 - markus@cvs.openbsd.org 2001/05/28 23:25:24
73 [channels.c]
74 cleanup, typo
72 75
7320010528 7620010528
74 - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c 77 - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
@@ -5499,4 +5502,4 @@
5499 - Wrote replacements for strlcpy and mkdtemp 5502 - Wrote replacements for strlcpy and mkdtemp
5500 - Released 1.0pre1 5503 - Released 1.0pre1
5501 5504
5502$Id: ChangeLog,v 1.1243 2001/06/05 20:52:50 mouring Exp $ 5505$Id: ChangeLog,v 1.1244 2001/06/05 20:56:47 mouring Exp $
diff --git a/channels.c b/channels.c
index 3eccb849e..719dbff53 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: channels.c,v 1.118 2001/05/28 23:14:49 markus Exp $"); 43RCSID("$OpenBSD: channels.c,v 1.119 2001/05/28 23:25:24 markus Exp $");
44 44
45#include <openssl/rsa.h> 45#include <openssl/rsa.h>
46#include <openssl/dsa.h> 46#include <openssl/dsa.h>
@@ -312,12 +312,11 @@ channel_free(Channel *c)
312 for (n = 0, i = 0; i < channels_alloc; i++) 312 for (n = 0, i = 0; i < channels_alloc; i++)
313 if (channels[i]) 313 if (channels[i])
314 n++; 314 n++;
315 315 debug("channel_free: channel %d: %s, nchannels %d", c->self,
316 debug("channel_free: channel %d: (%s) nchannels: %d", c->self,
317 c->remote_name ? c->remote_name : "???", n); 316 c->remote_name ? c->remote_name : "???", n);
318 317
319 s = channel_open_message(); 318 s = channel_open_message();
320 debug3("channel_free: status: %s", c->self, s); 319 debug3("channel_free: status: %s", s);
321 xfree(s); 320 xfree(s);
322 321
323 if (c->dettach_user != NULL) { 322 if (c->dettach_user != NULL) {