[PATCH 0/3] Three more nfs-utils clean ups

[PATCH 0/3] Three more nfs-utils clean ups

[Chuck Lever]

Hi Steve-

While digging through the last set of bugs in 2008, I constructed
these three fairly simple patches.  The middle one is probably the
most interesting, as it provides a little more flexibility about
how nfs-utils is built when libtirpc is present on the build system.

---

Chuck Lever (3):
      showmount command: Quiesce warning when TI-RPC is disabled
      configure: Add new build option "--enable-tirpc"
      configure: Remove inet_ntop(3) check from configure.ac


 configure.ac                |   34 +++++++++++++++++++++++-----------
 utils/showmount/showmount.c |   14 +++++++-------
 2 files changed, 30 insertions(+), 18 deletions(-)

-- 
Chuck Lever <chuck.lever@oracle.com>

[PATCH 1/3] configure: Remove inet_ntop(3) check from configure.ac

[Chuck Lever]

nfs-utils no longer uses inet_ntop(3) so remove checks for it from
configure.ac.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 configure.ac |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7140f48..4448743 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,8 +252,6 @@ AC_CHECK_DECL([AI_ADDRCONFIG],
               [ #include <netdb.h> ] )
 
 if test "$enable_ipv6" = yes; then
-  AC_CHECK_FUNC(inet_ntop, , ,
-               AC_MSG_ERROR(Function 'inet_ntop' not found.))
   AC_CHECK_FUNC(getnameinfo, , ,
                AC_MSG_ERROR(Function 'getnameinfo' not found.))
   AC_CHECK_LIB(tirpc, clnt_tli_create, ,
@@ -309,7 +307,7 @@ AC_FUNC_STAT
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
                gethostbyaddr gethostbyname gethostname getmntent \
-               inet_ntop getnameinfo getrpcbyname \
+               getnameinfo getrpcbyname \
                bindresvport_sa getnetconfig \
                clnt_create clnt_create_timed \
                clnt_tli_create clnt_vc_create clnt_dg_create xdr_rpcb \

[PATCH 2/3] configure: Add new build option "--enable-tirpc"

[Chuck Lever]

Allow easier testing of nfs-utils in legacy environments by providing
a "configure" option to force the build not to use libtirpc, even if
it's present on the build system.  This can also be tried as a
fallback if problems are found with the new TI-RPC-based nfs-utils
code.

The new option is:

  --enable-tirpc          enable use of TI-RPC [default=no]

Build option matrix:

   --disable-tirpc   --disable-ipv6	Default; IPv4 only, glibc RPC
   --disable-tirpc   --enable-ipv6	'configure' will fail
   --enable-tirpc    --disable-ipv6	IPv4 only, TI-RPC
   --enable-tirpc    --enable-ipv6	IPv4 and IPv6, TI-RPC

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 configure.ac |   30 ++++++++++++++++++++++--------
 1 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4448743..c8508f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,6 +131,14 @@ AC_ARG_ENABLE(ipv6,
 	AC_SUBST(enable_ipv6)
 	AM_CONDITIONAL(CONFIG_IPV6, [test "$enable_ipv6" = "yes"])
 
+AC_ARG_ENABLE(tirpc,
+	[AC_HELP_STRING([--enable-tirpc],
+                        [enable use of TI-RPC @<:@default=no@:>@])],
+	enable_tirpc=$enableval,
+	enable_tirpc=no)
+	AC_SUBST(enable_tirpc)
+	AM_CONDITIONAL(CONFIG_TIRPC, [test "$enable_tirpc" = "yes"])
+
 # Check whether user wants TCP wrappers support
 AC_TCP_WRAPPERS
 
@@ -251,13 +259,22 @@ AC_CHECK_DECL([AI_ADDRCONFIG],
                          [Define this to 1 if AI_ADDRCONFIG macro is defined]), ,
               [ #include <netdb.h> ] )
 
+if test "$enable_tirpc" = yes; then
+  AC_CHECK_LIB(tirpc, clnt_tli_create, ,
+           AC_MSG_ERROR([libtirpc not found.]))
+  AC_CHECK_HEADERS(tirpc/netconfig.h, ,
+                   AC_MSG_ERROR([libtirpc headers not found.]))
+  AC_CHECK_FUNCS([bindresvport_sa getnetconfig \
+                  clnt_create clnt_create_timed \
+                  clnt_vc_create clnt_dg_create xdr_rpcb])
+fi
+
 if test "$enable_ipv6" = yes; then
+  if test "$enable_tirpc" = no; then
+    AC_MSG_ERROR('--enable-ipv6' requires '--enable-tirpc'.)
+  fi
   AC_CHECK_FUNC(getnameinfo, , ,
                AC_MSG_ERROR(Function 'getnameinfo' not found.))
-  AC_CHECK_LIB(tirpc, clnt_tli_create, ,
-               AC_MSG_ERROR([libtirpc needed for IPv6 support]))
-  AC_CHECK_HEADERS(tirpc/netconfig.h, ,
-               AC_MSG_ERROR([libtirpc headers needed for IPv6 support]))
   AC_CHECK_DECL([AI_ADDRCONFIG], ,
                AC_MSG_ERROR([full getaddrinfo(3) implementation needed for IPv6 support]),
                [ #include <netdb.h> ] )
@@ -271,7 +288,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h \
                  stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h \
                  sys/param.h sys/socket.h sys/time.h sys/vfs.h \
                  syslog.h unistd.h com_err.h et/com_err.h \
-                 ifaddrs.h tirpc/netconfig.h])
+                 ifaddrs.h])
 
 dnl *************************************************************
 dnl Checks for typedefs, structures, and compiler characteristics
@@ -308,9 +325,6 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \
                gethostbyaddr gethostbyname gethostname getmntent \
                getnameinfo getrpcbyname \
-               bindresvport_sa getnetconfig \
-               clnt_create clnt_create_timed \
-               clnt_tli_create clnt_vc_create clnt_dg_create xdr_rpcb \
                gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \
                realpath rmdir select socket strcasecmp strchr strdup \
                strerror strrchr strtol strtoul sigprocmask])

[PATCH 3/3] showmount command: Quiesce warning when TI-RPC is disabled

[Chuck Lever]

Make sure nfs_sm_pgmtbl is not compiled if TI-RPC functions are not
available.  This quiesces the following compiler warning:

  showmount.c:53: warning: =E2=80=98nfs_sm_pgmtbl=E2=80=99 defined but =
not used

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

 utils/showmount/showmount.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 17f7d87..2695c51 100644
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -50,13 +50,6 @@ static int	aflag =3D 0;
 static int	dflag =3D 0;
 static int	eflag =3D 0;
=20
-static const char *nfs_sm_pgmtbl[] =3D {
-	"showmount",
-	"mount",
-	"mountd",
-	NULL,
-};
-
 static struct option longopts[] =3D
 {
 	{ "all", 0, 0, 'a' },
@@ -87,6 +80,13 @@ static void usage(FILE *fp, int n)
=20
 #ifdef HAVE_CLNT_CREATE
=20
+static const char *nfs_sm_pgmtbl[] =3D {
+	"showmount",
+	"mount",
+	"mountd",
+	NULL,
+};
+
 /*
  * Generate an RPC client handle connected to the mountd service
  * at @hostname, or die trying.

Re: [PATCH 0/3] Three more nfs-utils clean ups

[Steve Dickson]

Chuck Lever wrote:
> Hi Steve-
> 
> While digging through the last set of bugs in 2008, I constructed
> these three fairly simple patches.  The middle one is probably the
> most interesting, as it provides a little more flexibility about
> how nfs-utils is built when libtirpc is present on the build system.
> 
> ---
> 
> Chuck Lever (3):
>       showmount command: Quiesce warning when TI-RPC is disabled
>       configure: Add new build option "--enable-tirpc"
>       configure: Remove inet_ntop(3) check from configure.ac
> 
> 
>  configure.ac                |   34 +++++++++++++++++++++++-----------
>  utils/showmount/showmount.c |   14 +++++++-------
>  2 files changed, 30 insertions(+), 18 deletions(-)
> 
Committed...

steved.