From 07094e52e70792c9690149a8d742b38cbc25924f Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 25 Jun 2001 03:59:43 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2001/06/21 21:08:25 [session.c] don't reset forced_command (we allow multiple login shells in ssh2); dwd@bell-labs.com --- ChangeLog | 9 ++++++++- session.c | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c289efaf..e9e9a9cc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +20010525 + - OpenBSD CVS Sync + - markus@cvs.openbsd.org 2001/06/21 21:08:25 + [session.c] + don't reset forced_command (we allow multiple login shells in + ssh2); dwd@bell-labs.com + 20010622 - (stevesk) handle systems without pw_expire and pw_change. @@ -5681,4 +5688,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1297 2001/06/22 21:14:18 stevesk Exp $ +$Id: ChangeLog,v 1.1298 2001/06/25 03:59:43 mouring Exp $ diff --git a/session.c b/session.c index fbdc419eb..0c723ef1a 100644 --- a/session.c +++ b/session.c @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.92 2001/06/19 15:40:45 markus Exp $"); +RCSID("$OpenBSD: session.c,v 1.93 2001/06/21 21:08:25 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -599,7 +599,6 @@ do_exec(Session *s, const char *command) if (forced_command) { original_command = command; command = forced_command; - forced_command = NULL; debug("Forced command '%.900s'", command); }