summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-25 03:59:43 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-25 03:59:43 +0000
commit07094e52e70792c9690149a8d742b38cbc25924f (patch)
treed92afc1951ae702aee00a194f8314723d57ed475
parent824569537f874d754041f2c1b0898feda0c12f31 (diff)
- 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
-rw-r--r--ChangeLog9
-rw-r--r--session.c3
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6c289efa..e9e9a9cc 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 fbdc419e..0c723ef1 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);
}