The branch stable/13 has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=cc489905bab0f0cc9009566686bf60133bf340ee
commit cc489905bab0f0cc9009566686bf60133bf340ee
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2021-02-12 14:09:00 +0000
Commit: Ed Maste <ema...@freebsd.org>
CommitDate: 2021-02-15 01:22:22 +0000
ssh: remove ssh-hpn leftovers
This was introduced in 8998619212f3a, and left behind when the hpn-ssh
patches were removed in 60c59fad8806. Although Being able to log
SO_RCVBUF in debug mode might have some small value on its own, it's
not worth carrying an extra diff against upstream.
Reviewed by: kevans
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D28610
(cherry picked from commit a62dc346f6171ef1bd52bb8795eaf2d64394ac24)
---
crypto/openssh/sshd.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 06fa7b8de339..532e5dc04fc2 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -1056,8 +1056,6 @@ listen_on_addrs(struct listenaddr *la)
int ret, listen_sock;
struct addrinfo *ai;
char ntop[NI_MAXHOST], strport[NI_MAXSERV];
- int socksize;
- socklen_t len;
for (ai = la->addrs; ai; ai = ai->ai_next) {
if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
@@ -1103,10 +1101,6 @@ listen_on_addrs(struct listenaddr *la)
debug("Bind to port %s on %s.", strport, ntop);
- len = sizeof(socksize);
- getsockopt(listen_sock, SOL_SOCKET, SO_RCVBUF, &socksize, &len);
- debug("Server TCP RWIN socket size: %d", socksize);
-
/* Bind the socket to the desired port. */
if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) {
error("Bind to port %s on %s failed: %.200s.",
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
