Add POLLNVAL to the set of poll revents

diff --git a/etc/afpd/main.c b/etc/afpd/main.c
index 550a809f82a61ca7c8f85b3d001a16fc1d3e62cd..5b79c08dea6872eb8396f75ec6e8e9a5838fcf88 100644 (file)
--- a/etc/afpd/main.c
+++ b/etc/afpd/main.c
@@ -412,7 +412,7 @@ int main(int ac, char **av)
         }
 
         for (int i = 0; i < fdset_used; i++) {
-            if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP)) {
+            if (fdset[i].revents & (POLLIN | POLLERR | POLLHUP | POLLNVAL)) {
                 switch (polldata[i].fdtype) {
 
                 case LISTEN_FD:

diff --git a/libatalk/util/server_child.c b/libatalk/util/server_child.c
index b4bc3542acf562731539744a20f7f1136f718d68..c87417d54702bbfb58a022ac1e6755b744ac655c 100644 (file)
--- a/libatalk/util/server_child.c
+++ b/libatalk/util/server_child.c
@@ -199,7 +199,6 @@ void server_child_free(server_child *children)
     server_child_fork *fork;
     struct server_child_data *child, *tmp;
     int i, j;
-    pid_t pid = getpid();
 
     for (i = 0; i < children->nforks; i++) {
         fork = (server_child_fork *) children->fork + i;