summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--clientloop.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b5c74b5a..a4579b916 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
4 [sshconnect2.c] 4 [sshconnect2.c]
5 uint32_t -> u_int32_t (which we use everywhere else) 5 uint32_t -> u_int32_t (which we use everywhere else)
6 (Id sync only - portable already had this) 6 (Id sync only - portable already had this)
7 - markus@cvs.openbsd.org 2006/05/16 09:00:00
8 [clientloop.c]
9 missing free; from Kylene Hall
7 10
820060521 1120060521
9 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor 12 - (dtucker) [auth.c monitor.c] Now that we don't log from both the monitor
@@ -4637,4 +4640,4 @@
4637 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4640 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4638 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4641 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4639 4642
4640$Id: ChangeLog,v 1.4331 2006/06/13 02:59:53 djm Exp $ 4643$Id: ChangeLog,v 1.4332 2006/06/13 03:00:09 djm Exp $
diff --git a/clientloop.c b/clientloop.c
index d317b79f4..a9572134a 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.162 2006/04/20 09:27:09 djm Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.163 2006/05/16 09:00:00 markus 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
@@ -844,6 +844,7 @@ client_process_control(fd_set *readset)
844 844
845 debug2("%s: accepted tty %d, subsys %d, cmd %s", __func__, 845 debug2("%s: accepted tty %d, subsys %d, cmd %s", __func__,
846 cctx->want_tty, cctx->want_subsys, cmd); 846 cctx->want_tty, cctx->want_subsys, cmd);
847 xfree(cmd);
847 848
848 /* Gather fds from client */ 849 /* Gather fds from client */
849 new_fd[0] = mm_receive_fd(client_fd); 850 new_fd[0] = mm_receive_fd(client_fd);