mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-01 23:05:17 +00:00
Code Issues Releases Wiki Activity

Don't display "error in event loop" on loop break reading ServerHello.

Browse Source 
We should already have displayed a more useful error message.
Otherwise, we can get two "error in event loop" warnings if
the TLS handshake fails (in addition to other error messages).
This commit is contained in:
Todd C. Miller
2020-02-01 08:32:27 -07:00
parent b9bea25592
commit 49e7e4ecd5
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/sudoers/iolog_client.c
View File

@@ -489,7 +489,7 @@ tls_timed_connect(int sock, SSL *ssl, struct timespec *timo)
goto done; goto done;
} }
if (sudo_ev_dispatch(closure.evbase) == -1 || sudo_ev_got_break(closure.evbase)) { if (sudo_ev_dispatch(closure.evbase) == -1) {
sudo_warnx(U_("error in event loop")); sudo_warnx(U_("error in event loop"));
goto done; goto done;
} }
@@ -1059,14 +1059,15 @@ read_server_hello(int sock, struct client_closure *closure)
sudo_warnx(U_("unable to add event to queue")); sudo_warnx(U_("unable to add event to queue"));
goto done; goto done;
} }
if (sudo_ev_dispatch(evbase) == -1 || sudo_ev_got_break(evbase)) { if (sudo_ev_dispatch(evbase) == -1) {
sudo_warnx(U_("error in event loop")); sudo_warnx(U_("error in event loop"));
goto done; goto done;
} }
/* Note: handle_server_hello() reset the event back to sudo's event loop. */ if (!sudo_ev_got_break(evbase))
ret = true;
ret = true; /* Note: handle_server_hello() reset the event back to sudo's event loop. */
done: done:
sudo_ev_base_free(evbase); sudo_ev_base_free(evbase);