diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-01-27 09:26:53 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-01-27 20:28:25 +1100 |
| commit | 4ca6a1fac328477c642329676d6469dba59019a3 (patch) | |
| tree | ac76df599462722785b86d21f2a82f5b7fc8888a /nchan.c | |
| parent | bba229b6f3328171f5e3ae85de443002523c0452 (diff) | |
| download | openssh-git-4ca6a1fac328477c642329676d6469dba59019a3.tar.gz | |
upstream: remove global variable used to stash compat flags and use the
purpose-built ssh->compat variable instead; feedback/ok markus@
OpenBSD-Commit-ID: 7c4f200e112dae6bcf99f5bae1a5629288378a06
Diffstat (limited to 'nchan.c')
| -rw-r--r-- | nchan.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: nchan.c,v 1.71 2020/10/18 11:32:01 djm Exp $ */ +/* $OpenBSD: nchan.c,v 1.72 2021/01/27 09:26:54 djm Exp $ */ /* * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. * @@ -233,7 +233,7 @@ chan_send_eow2(struct ssh *ssh, Channel *c) c->self); return; } - if (!(datafellows & SSH_NEW_OPENSSH)) + if (!(ssh->compat & SSH_NEW_OPENSSH)) return; if (!c->have_remote_id) fatal_f("channel %d: no remote_id", c->self); @@ -334,7 +334,7 @@ chan_is_dead(struct ssh *ssh, Channel *c, int do_send) } if (c->istate != CHAN_INPUT_CLOSED || c->ostate != CHAN_OUTPUT_CLOSED) return 0; - if ((datafellows & SSH_BUG_EXTEOF) && + if ((ssh->compat & SSH_BUG_EXTEOF) && c->extended_usage == CHAN_EXTENDED_WRITE && c->efd != -1 && sshbuf_len(c->extended) > 0) { |