nfs-utils: Include legacy or TI-RPC headers, not both

[nfs-utils.git] / utils / mountd / svc_run.c

diff --git a/utils/mountd/svc_run.c b/utils/mountd/svc_run.c
index a1ef74adf306c4e7abb302754ea0f25c256b9b0a..5ba5af6ddc7eb10915b3695f623e4ba6e47ceeca 100644 (file)
--- a/utils/mountd/svc_run.c
+++ b/utils/mountd/svc_run.c
@@ -43,16 +43,50 @@
  * This is the RPC server side idle loop.
  * Wait for input, call server program.
  */
-#include "config.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <sys/types.h>
 #include <rpc/rpc.h>
 #include "xlog.h"
 #include <errno.h>
 #include <time.h>
 
+#ifdef HAVE_LIBTIRPC
+#include <rpc/rpc_com.h>
+#endif
+
 void cache_set_fds(fd_set *fdset);
 int cache_process_req(fd_set *readfds);
 
+#if LONG_MAX != INT_MAX        
+/* bug in glibc 2.3.6 and earlier, we need
+ * our own svc_getreqset
+ */
+static void
+my_svc_getreqset (fd_set *readfds)
+{
+       fd_mask mask;
+       fd_mask *maskp;
+       int setsize;
+       int sock;
+       int bit;
+
+       setsize = _rpc_dtablesize ();
+       if (setsize > FD_SETSIZE)
+               setsize = FD_SETSIZE;
+       maskp = readfds->fds_bits;
+       for (sock = 0; sock < setsize; sock += NFDBITS)
+               for (mask = *maskp++;
+                    (bit = ffsl (mask));
+                    mask ^= (1L << (bit - 1)))
+                       svc_getreq_common (sock + bit - 1);
+}
+#define svc_getreqset my_svc_getreqset
+
+#endif
 
 /*
  * The heart of the server.  A crib from libc for the most part...