summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-12-30 03:25:14 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-12-30 03:25:14 +0000
commit6c3ae2ba053d7d9e615af5df72162ce912051c2a (patch)
treed302ac6657cb12d4dc4071276e6ef136e7381050
parentf5410351c360e484a7831650458724f2cc084688 (diff)
- (bal) OpenBSD CVS Update
- markus@cvs.openbsd.org 2000/12/29 22:19:13 [channels.c] missing xfree; from vaughan99@yahoo.com
-rw-r--r--ChangeLog3
-rw-r--r--channels.c8
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fc9f9a021..ce20b191f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - markus@cvs.openbsd.org 2000/12/28 18:58:30 3 - markus@cvs.openbsd.org 2000/12/28 18:58:30
4 [ssh-keygen.c] 4 [ssh-keygen.c]
5 enable 'ssh-keygen -l -f ~/.ssh/{authorized_keys,known_hosts}{,2} 5 enable 'ssh-keygen -l -f ~/.ssh/{authorized_keys,known_hosts}{,2}
6 - markus@cvs.openbsd.org 2000/12/29 22:19:13
7 [channels.c]
8 missing xfree; from vaughan99@yahoo.com
6 - (bal) Resynced CVS ID with OpenBSD for channel.c and uidswap.c 9 - (bal) Resynced CVS ID with OpenBSD for channel.c and uidswap.c
7 - (bal) if no MAXHOSTNAMELEN is defined. Default to 64 character defination. 10 - (bal) if no MAXHOSTNAMELEN is defined. Default to 64 character defination.
8 Suggested by Christian Kurz <shorty@debain.org> 11 Suggested by Christian Kurz <shorty@debain.org>
diff --git a/channels.c b/channels.c
index 11cdf1bb7..b1fcd7ca8 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.78 2000/12/29 11:05:55 markus Exp $"); 43RCSID("$OpenBSD: channels.c,v 1.79 2000/12/29 22:19:13 markus Exp $");
44 44
45#include "ssh.h" 45#include "ssh.h"
46#include "packet.h" 46#include "packet.h"
@@ -307,9 +307,13 @@ void
307channel_free(int id) 307channel_free(int id)
308{ 308{
309 Channel *c = channel_lookup(id); 309 Channel *c = channel_lookup(id);
310 char *s = channel_open_message();
311
310 if (c == NULL) 312 if (c == NULL)
311 packet_disconnect("channel free: bad local channel %d", id); 313 packet_disconnect("channel free: bad local channel %d", id);
312 debug("channel_free: channel %d: status: %s", id, channel_open_message()); 314 debug("channel_free: channel %d: status: %s", id, s);
315 xfree(s);
316
313 if (c->dettach_user != NULL) { 317 if (c->dettach_user != NULL) {
314 debug("channel_free: channel %d: dettaching channel user", id); 318 debug("channel_free: channel %d: dettaching channel user", id);
315 c->dettach_user(c->self, NULL); 319 c->dettach_user(c->self, NULL);