diff options
| author |   djm <djm@openbsd.org> | 2021-01-27 09:26:53 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2021-01-27 09:26:53 +0000 |
| commit | e9d148002645cf940f00f302cb4b8cd9c8931a72 (patch) | |
| tree | f069aab07aa0d8db3d5a2dd8fb7a295484b3b0b9 /usr.bin/ssh/ssh.c | |
| parent | Be consistent in not using parameter names for function prototypes. (diff) | |
| download | wireguard-openbsd-e9d148002645cf940f00f302cb4b8cd9c8931a72.tar.xz wireguard-openbsd-e9d148002645cf940f00f302cb4b8cd9c8931a72.zip | |
remove global variable used to stash compat flags and use the
purpose-built ssh->compat variable instead; feedback/ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 253df182726..c9299958c6c 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -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 @@ -2097,7 +2097,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, |