Treat EINTR in a callback like we do EAGAIN.

We shouldn't get EINTR in practice since we set SA_RESTART when
registering signal handlers but it doesn't hurt to be consistent.

1 files changed, 5 insertions, 4 deletions

diff --git a/logsrvd/logsrvd.c b/logsrvd/logsrvd.c
index 23d85b410..4bf739ff5 100644
--- a/logsrvd/logsrvd.c
+++ b/logsrvd/logsrvd.c
@@ -929,7 +929,7 @@ server_msg_cb(int fd, int what, void *v)
     }
 
     if (nwritten == -1) {
-	if (errno == EAGAIN)
+	if (errno == EAGAIN || errno == EINTR)
 	    debug_return;
 	sudo_warn("%s: write", closure->ipaddr);
 	goto finished;
@@ -1045,7 +1045,7 @@ client_msg_cb(int fd, int what, void *v)
 	__func__, nread, closure->ipaddr);
     switch (nread) {
     case -1:
-	if (errno == EAGAIN)
+	if (errno == EAGAIN || errno == EINTR)
 	    debug_return;
 	sudo_warn("%s: read", closure->ipaddr);
 	goto close_connection;
@@ -1521,9 +1521,10 @@ listener_cb(int fd, int what, void *v)
 		"unable to start new connection");
 	}
     } else {
-	if (errno != EAGAIN)
-	    sudo_warn("accept");
+	if (errno == EAGAIN || errno == EINTR)
+	    debug_return;
 	/* TODO: pause accepting on ENFILE and EMFILE */
+	sudo_warn("accept");
     }
 
     debug_return;