summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-02-05 11:35:56 +0000
committerDamien Miller <djm@mindrot.org>2019-02-08 13:10:57 +1100
commit8c53d409baeeaf652c0c125a9b164edc9dbeb6de (patch)
tree506fe0fcdbe58e90908f33b9fbda7e1772f7399f /session.c
parent7a7fdca78de4b4774950be056099e579ef595414 (diff)
upstream: Adapt code in the non-USE_PIPES codepath to the new packet
API. This code is not normally reachable since USE_PIPES is always defined. bz#2961, patch from adrian.fita at gmail com. OpenBSD-Commit-ID: 8d8428d678d1d5eb4bb21921df34e8173e6d238a
Diffstat (limited to 'session.c')
-rw-r--r--session.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/session.c b/session.c
index 4862e5d63..4448e6f1f 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.312 2019/01/19 21:41:53 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.313 2019/02/05 11:35:56 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -545,7 +545,7 @@ do_exec_no_pty(struct ssh *ssh, Session *s, const char *command)
545 * Enter the interactive session. Note: server_loop must be able to 545 * Enter the interactive session. Note: server_loop must be able to
546 * handle the case that fdin and fdout are the same. 546 * handle the case that fdin and fdout are the same.
547 */ 547 */
548 session_set_fds(s, inout[1], inout[1], err[1], 548 session_set_fds(ssh, s, inout[1], inout[1], err[1],
549 s->is_subsystem, 0); 549 s->is_subsystem, 0);
550#endif 550#endif
551 return 0; 551 return 0;