| author | Rich Burridge <rich.burridge@oracle.com> |
| Wed, 28 Oct 2015 12:22:49 -0700 | |
| changeset 5023 | 93fb5351ff40 |
| parent 4977 | eef946d5ac8f |
| permissions | -rw-r--r-- |
|
4977
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
1 |
Remove error() accidentally inserted for debugging. |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
2 |
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
3 |
OpenSSH 6.8 regression, already fixed in OpenSSH 6.9: |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
4 |
https://github.com/openssh/openssh-portable/commit/4d24b3b6 |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
5 |
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
6 |
Remove this patch when upgrading to OpenSSH 6.9 or higher. |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
7 |
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
8 |
diff -pur old/monitor_wrap.c new/monitor_wrap.c |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
9 |
--- old/monitor_wrap.c |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
10 |
+++ new/monitor_wrap.c |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
11 |
@@ -153,10 +153,8 @@ mm_request_receive(int sock, Buffer *m) |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
12 |
debug3("%s entering", __func__);
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
13 |
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
14 |
if (atomicio(read, sock, buf, sizeof(buf)) != sizeof(buf)) {
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
15 |
- if (errno == EPIPE) {
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
16 |
- error("%s: socket closed", __func__);
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
17 |
+ if (errno == EPIPE) |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
18 |
cleanup_exit(255); |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
19 |
- } |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
20 |
fatal("%s: read: %s", __func__, strerror(errno));
|
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
21 |
} |
|
eef946d5ac8f
21881806 openssh syslogs message when ending a session:mm_request_receive: socket closed
Tomas Kuthan <tomas.kuthan@oracle.com>
parents:
diff
changeset
|
22 |
msg_len = get_u32(buf); |