--- nfs-utils-2.3.1/configure.ac.orig	2018-05-21 11:05:01.939912918 -0700
+++ nfs-utils-2.3.1/configure.ac	2018-05-21 11:05:10.531968707 -0700
@@ -401,7 +401,7 @@
 fi
 
 dnl libdnsidmap specific checks
-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
+AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed))
 
 AC_ARG_ENABLE([ldap],
 	[AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])])
--- nfs-utils-2.3.1/support/misc/file.c.orig	2018-05-21 18:15:37.572007979 +0000
+++ nfs-utils-2.3.1/support/misc/file.c	2018-05-21 18:15:43.668047008 +0000
@@ -27,6 +27,7 @@
 #include <dirent.h>
 #include <stdlib.h>
 #include <stdbool.h>
+#include <limits.h> /* PATH_MAX */
 
 #include "xlog.h"
 #include "misc.h"
--- nfs-utils-2.3.3/configure.old	2018-09-06 18:10:07.000000000 +0000
+++ nfs-utils-2.3.3/configure	2019-01-10 16:01:32.110000000 +0000
@@ -20302,9 +20302,9 @@
   fi
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_querydomain in -lresolv" >&5
-$as_echo_n "checking for __res_querydomain in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___res_querydomain+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_querydomain in -lresolv" >&5
+$as_echo_n "checking for res_querydomain in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_querydomain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -20318,27 +20318,27 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_querydomain ();
+char res_querydomain ();
 int
 main ()
 {
-return __res_querydomain ();
+return res_querydomain ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_resolv___res_querydomain=yes
+  ac_cv_lib_resolv_res_querydomain=yes
 else
-  ac_cv_lib_resolv___res_querydomain=no
+  ac_cv_lib_resolv_res_querydomain=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_querydomain" >&5
-$as_echo "$ac_cv_lib_resolv___res_querydomain" >&6; }
-if test "x$ac_cv_lib_resolv___res_querydomain" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_querydomain" >&5
+$as_echo "$ac_cv_lib_resolv_res_querydomain" >&6; }
+if test "x$ac_cv_lib_resolv_res_querydomain" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBRESOLV 1
 _ACEOF