- 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

diff --git a/ChangeLog b/ChangeLog
index 83e8fe646023bb18dbd992fc46d64d10794aae22..3d30e07fd22bd0014ba4ea9f13a74b019b56f8f4 100644 (file)
--- 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.
 

diff --git a/session.c b/session.c
index fbdc419eb5d73d4d6e67487e8d275c8ee3c58cc1..0c723ef1ad2b7875e90e6af7f61563ac03bd16d5 100644 (file)
--- 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);
        }