diff options
author | Colin Watson <cjwatson@debian.org> | 2020-06-07 10:19:24 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2020-06-07 11:03:12 +0100 |
commit | 30337f8b66c66af6b368d1e3c789e75f1247176c (patch) | |
tree | 17e0b8652fea31c04faa19ffc4cd088552ee473a /mux.c | |
parent | aef2be11c5ea90bc66e774923e6570213e54c195 (diff) | |
parent | 39b8d128ef980a410bb1ea0ee80e95ac9fff59c3 (diff) |
New upstream release (8.3p1)
Also update GSSAPI key exchange patch from
https://github.com/openssh-gsskex/openssh-gsskex.
Diffstat (limited to 'mux.c')
-rw-r--r-- | mux.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.81 2020/01/23 07:10:22 dtucker Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.82 2020/04/30 17:12:20 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1987,6 +1987,7 @@ mux_client_request_session(int fd) | |||
1987 | case MUX_S_SESSION_OPENED: | 1987 | case MUX_S_SESSION_OPENED: |
1988 | if ((r = sshbuf_get_u32(m, &sid)) != 0) | 1988 | if ((r = sshbuf_get_u32(m, &sid)) != 0) |
1989 | fatal("%s: decode ID: %s", __func__, ssh_err(r)); | 1989 | fatal("%s: decode ID: %s", __func__, ssh_err(r)); |
1990 | debug("%s: master session id: %u", __func__, sid); | ||
1990 | break; | 1991 | break; |
1991 | case MUX_S_PERMISSION_DENIED: | 1992 | case MUX_S_PERMISSION_DENIED: |
1992 | if ((r = sshbuf_get_cstring(m, &e, NULL)) != 0) | 1993 | if ((r = sshbuf_get_cstring(m, &e, NULL)) != 0) |