mirror of
https://github.com/openssh/openssh-portable.git
synced 2026-11-06 05:16:43 +00:00
Remove the NetBSD BROKEN_READ_COMPARISON workaround.
It does not seem to be needed on current versions, and it can cause pre-auth CPU spinning now that we're using atomicio() in the banner exchange. ok djm@
This commit is contained in:
2 files changed
-6
No files matched your search
@@ -51,11 +51,7 @@ atomicio6(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n,
|
||||
struct pollfd pfd;
|
||||
|
||||
pfd.fd = fd;
|
||||
#ifndef BROKEN_READ_COMPARISON
|
||||
pfd.events = f == read ? POLLIN : POLLOUT;
|
||||
#else
|
||||
pfd.events = POLLIN|POLLOUT;
|
||||
#endif
|
||||
while (n > pos) {
|
||||
res = (f) (fd, s + pos, n - pos);
|
||||
switch (res) {
|
||||
|
||||
@@ -1134,8 +1134,6 @@ mips-sony-bsd|mips-sony-newsos4)
|
||||
AC_DEFINE([SSH_TUN_PREPEND_AF], [1],
|
||||
[Prepend the address family to IP tunnel traffic])
|
||||
TEST_MALLOC_OPTIONS="AJRX"
|
||||
AC_DEFINE([BROKEN_READ_COMPARISON], [1],
|
||||
[NetBSD read function is sometimes redirected, breaking atomicio comparisons against it])
|
||||
;;
|
||||
*-*-freebsd*)
|
||||
AC_DEFINE([LOCKED_PASSWD_PREFIX], ["*LOCKED*"], [Account locked with pw(1)])
|
||||
|
||||
Reference in new issue
Block a user