summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-09-14 23:12:07 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-09-14 23:12:07 +0000
commitb09f6b5b027e79692b9a4eb18c905cf49feda610 (patch)
tree629741df1720333fe383cdbf1506e1505b1e1785
parentd5e1c04c00fbc8fb3338fb4575cdbe93ae8d3f52 (diff)
- markus@cvs.openbsd.org 2001/09/14
[session.c] command=xxx overwrites subsystems, too
-rw-r--r--ChangeLog7
-rw-r--r--session.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5dc5b18fa..ba9660889 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,10 @@
3 - markus@cvs.openbsd.org 2001/09/13 3 - markus@cvs.openbsd.org 2001/09/13
4 [rijndael.c rijndael.h] 4 [rijndael.c rijndael.h]
5 missing $OpenBSD 5 missing $OpenBSD
6 6 - markus@cvs.openbsd.org 2001/09/14
7 [session.c]
8 command=xxx overwrites subsystems, too
9
720010913 1020010913
8 - (bal) OpenBSD CVS Sync 11 - (bal) OpenBSD CVS Sync
9 - markus@cvs.openbsd.org 2001/08/23 11:31:59 12 - markus@cvs.openbsd.org 2001/08/23 11:31:59
@@ -6422,4 +6425,4 @@
6422 - Wrote replacements for strlcpy and mkdtemp 6425 - Wrote replacements for strlcpy and mkdtemp
6423 - Released 1.0pre1 6426 - Released 1.0pre1
6424 6427
6425$Id: ChangeLog,v 1.1512 2001/09/14 23:09:29 mouring Exp $ 6428$Id: ChangeLog,v 1.1513 2001/09/14 23:12:07 mouring Exp $
diff --git a/session.c b/session.c
index 1e9e32284..e088fe700 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
33 */ 33 */
34 34
35#include "includes.h" 35#include "includes.h"
36RCSID("$OpenBSD: session.c,v 1.100 2001/08/16 19:18:34 jakob Exp $"); 36RCSID("$OpenBSD: session.c,v 1.101 2001/09/14 18:59:11 markus Exp $");
37 37
38#include "ssh.h" 38#include "ssh.h"
39#include "ssh1.h" 39#include "ssh1.h"
@@ -1685,7 +1685,7 @@ session_subsystem_req(Session *s)
1685 if(strcmp(subsys, options.subsystem_name[i]) == 0) { 1685 if(strcmp(subsys, options.subsystem_name[i]) == 0) {
1686 debug("subsystem: exec() %s", options.subsystem_command[i]); 1686 debug("subsystem: exec() %s", options.subsystem_command[i]);
1687 s->is_subsystem = 1; 1687 s->is_subsystem = 1;
1688 do_exec_no_pty(s, options.subsystem_command[i]); 1688 do_exec(s, options.subsystem_command[i]);
1689 success = 1; 1689 success = 1;
1690 } 1690 }
1691 } 1691 }