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 /ssh.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 'ssh.c')
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.548 2021/01/26 05:32:22 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.549 2021/01/27 09:26:54 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2118,7 +2118,7 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo) /* If we don't expect to open a new session, then disallow it */ if (options.control_master == SSHCTL_MASTER_NO && - (datafellows & SSH_NEW_OPENSSH)) { + (ssh->compat & SSH_NEW_OPENSSH)) { debug("Requesting no-more-sessions@openssh.com"); if ((r = sshpkt_start(ssh, SSH2_MSG_GLOBAL_REQUEST)) != 0 || (r = sshpkt_put_cstring(ssh, |